X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-checkout.txt;h=3bccffae628e065a6cd92155a9283d5710991fd7;hb=de8139005f04a4a5ad8a54c771475803594028cd;hp=79824f4819863577fbc1a313e82c739d59ea3a0e;hpb=c0ceb2c32d40c4bc835597105ba0c0fac4ae36ba;p=git.git

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 79824f481..3bccffae6 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -133,6 +133,10 @@ the conflicted merge in the specified paths.
 +
 When this parameter names a non-branch (but still a valid commit object),
 your HEAD becomes 'detached'.
++
+As a special case, the "`@\{-N\}`" syntax for the N-th last branch
+checks out the branch (instead of detaching).  You may also specify
+"`-`" which is synonymous with "`@\{-1\}`".
 
 
 Detached HEAD
@@ -232,7 +236,6 @@ the `-m` option, you would see something like this:
 ------------
 $ git checkout -m mytopic
 Auto-merging frotz
-merge: warning: conflicts during merge
 ERROR: Merge conflict in frotz
 fatal: merge program failed
 ------------