Merge branch 'maint-1.6.0' into maint

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index f43af417404d4f0f658933d57742d23c847f1619..9f85d60b5fb6d6ae1b4d8c2e65a6131cbe21450b 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -53,7 +53,7 @@ OPTIONS
 
 -s::
 --stage::
-       Show stage files in the output
+       Show staged contents' object name, mode bits and stage number in the output.
 
 --directory::
        If a whole directory is classified as "other", show just its