Merge branch 'maint-1.7.0' into maint

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index af409bf3b2fed15c332ec26656785b3b3d14e991..3521637b582687978c088dc463e8784817a92217 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -141,7 +141,7 @@ OPTIONS
 
 Output
 ------
-show files just outputs the filename unless '--stage' is specified in
+'git ls-files' just outputs the filenames unless '--stage' is specified in
 which case it outputs:
 
         [<tag> ]<mode> <object> <stage> <file>