Merge branch 'bs/userdiff-php'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 5863decdc9f96669e839b3e16cc265ddb699fce7..50ba2e469f48f1bc16c3f6e3b6f6451a9e29637a 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -206,6 +206,10 @@ OPTIONS
        --onto option is not specified, the starting point is
        <upstream>.  May be any valid commit, and not just an
        existing branch name.
++
+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.
 
 <upstream>::
        Upstream branch to compare against.  May be any valid commit,