Merge branch 'ah/doc-gitattributes-empty-index' into maint

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