rebase --rebase-merges: root commits can be cousins, too

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 84b140dbdc0fa4c6487e315869f73fc261c0619b..c16e27e63d4cf6522d29c9d0ff099e06cfcd38a4 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -130,6 +130,11 @@ ignored, then the directory is not shown, but all contents are shown.
        without options are equivalent to 'always' and 'never'
        respectively.
 
+--ahead-behind::
+--no-ahead-behind::
+       Display or do not display detailed ahead/behind counts for the
+       branch relative to its upstream branch.  Defaults to true.
+
 <pathspec>...::
        See the 'pathspec' entry in linkgit:gitglossary[7].