Merge branch 'jk/relative-directory-fix'

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index f9c91c721e909291ba42c27c3fd521135b4869f0..6c230c0c7200412b988d233352e3411a9fb813a8 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].