Merge branch 'rs/urlmatch-cleanup'

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index d70abc6afe3aa40aaaab2e055ee75d8ee22cdb69..d47f198f15cd4c767b03c14580b816bf750e9ee1 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