Merge branch 'rs/fsck-null-return-from-lookup'

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 54407112956b9d829b57eeb550e6cd2c63e385d8..9f3a78a36c48c55318ee0eea8e96a64ccce5bfa2 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -32,6 +32,9 @@ OPTIONS
 --branch::
        Show the branch and tracking info even in short-format.
 
+--show-stash::
+       Show the number of entries currently stashed away.
+
 --porcelain[=<version>]::
        Give the output in an easy-to-parse format for scripts.
        This is similar to the short output, but will remain stable