summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 18:45:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-27 18:45:31 (GMT)
commitc380cf85a79c78d9dceb9290c9d4017d30804521 (patch)
tree642001713f918aaa60fdc264994ae7a344a5b4bb
parentbf3939901bd18f9d22f1b54323d2dd8032ec8051 (diff)
parent75d6e552a8f289fb0ee606a7bdfceace6df93bb3 (diff)
downloadgit-c380cf85a79c78d9dceb9290c9d4017d30804521.zip
git-c380cf85a79c78d9dceb9290c9d4017d30804521.tar.gz
git-c380cf85a79c78d9dceb9290c9d4017d30804521.tar.bz2
Merge branch 'tr/nth-previous-is-a-commit'
* tr/nth-previous-is-a-commit: Documentation: @{-N} can refer to a commit
-rw-r--r--Documentation/git-checkout.txt4
-rw-r--r--Documentation/revisions.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 91294f8..33ad2ad 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -232,8 +232,8 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
commit, your HEAD becomes "detached" and you are no longer on
any branch (see below for details).
+
-As a special case, the `"@{-N}"` syntax for the N-th last branch
-checks out the branch (instead of detaching). You may also specify
+As a special case, the `"@{-N}"` syntax for the N-th last branch/commit
+checks out branches (instead of detaching). You may also specify
`-` which is synonymous with `"@{-1}"`.
+
As a further special case, you may use `"A...B"` as a shortcut for the
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 2c06ed3..5a286d0 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -88,7 +88,7 @@ some output processing may assume ref names in UTF-8.
branch 'blabla' then '@\{1\}' means the same as 'blabla@\{1\}'.
'@\{-<n>\}', e.g. '@\{-1\}'::
- The construct '@\{-<n>\}' means the <n>th branch checked out
+ The construct '@\{-<n>\}' means the <n>th branch/commit checked out
before the current one.
'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::