Merge branch 'maint-1.6.1' into maint-1.6.2

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 5ece6cc8053d883b3f47a41c4b87ab2d46248267..132fc4faa5efab2a07b592e3567340b5eeb3f910 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -137,6 +137,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