Merge branch 'hg/id-munging'

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 4505eb6d84990944009d0b5e560de4bd4d2022e8..afda5c36b5ac0061d94d706cd7a07ef8197b6b31 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -154,6 +154,10 @@ edits from your current working tree.
 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\}"`.
++
+As a further special case, you may use `"A...B"` as a shortcut for the
+merge base of `A` and `B` if there is exactly one merge base. You can
+leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 
 <new_branch>::
        Name for the new branch.