Merge branch 'dl/checkout-p-merge-base'

[thirdparty/git.git] / Documentation / git-checkout.txt

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 5b697eee1b7632a046b48d488b3c3af75ad7fa45..6ae8bf8deeb2928bad689d1f50cbfe34c806a376 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -198,6 +198,7 @@ Use `--no-guess` to disable this.
        Create the new branch's reflog; see linkgit:git-branch[1] for
        details.
 
+-d::
 --detach::
        Rather than checking out a branch to work on it, check out a
        commit for inspection and discardable experiments.
@@ -350,6 +351,10 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 <tree-ish>::
        Tree to checkout from (when paths are given). If not specified,
        the index will be used.
++
+As a 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`.
 
 \--::
        Do not interpret any more arguments as options.