From: Thomas Rast
Date: Sun, 19 Jan 2014 07:01:15 GMT
Subject: [PATCH] Documentation: @{-N} can refer to a commit
Message-ID:
In-Reply-To:
The @{-N} syntax always referred to the N-th last thing checked out,
which can be either a branch or a commit (for detached HEAD cases).
However, the documentation only mentioned branches.
Edit in a "/commit" in the appropriate places.
Reported-by: Kevin
Signed-off-by: Thomas Rast
---
This is the "minimal" edit. I'd welcome better wording for the
git-commit manpage, I can't come up with any right now.
Documentation/git-checkout.txt | 4 ++--
Documentation/revisions.txt | 2 +-
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\}'.
'@\{-\}', e.g. '@\{-1\}'::
- The construct '@\{-\}' means the th branch checked out
+ The construct '@\{-\}' means the th branch/commit checked out
before the current one.
'@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
--
1.9.rc0.162.g8980120