summaryrefslogtreecommitdiffstats
path: root/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-06-02 23:32:31 +0000
committerJunio C Hamano <junio@kernel.org>2010-06-02 23:32:31 +0000
commite32ec8b89b623de73d1ccacb430b1c4ab16e4fcb (patch)
tree27285614d896d302efe7f7740b87009fd0ae0c33 /git-checkout.txt
parentb671fb5c100813248be882136374ea6c6038d4e8 (diff)
downloadgit-htmldocs-e32ec8b89b623de73d1ccacb430b1c4ab16e4fcb.tar.gz
Autogenerated HTML docs for v1.7.1-244-gbdc4
Diffstat (limited to 'git-checkout.txt')
-rw-r--r--git-checkout.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-checkout.txt b/git-checkout.txt
index 4505eb6d8..afda5c36b 100644
--- a/git-checkout.txt
+++ b/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.