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 afa5c11fd3c4d58f978e5bb99a03517c642584c6..6ae8bf8deeb2928bad689d1f50cbfe34c806a376 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -351,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.