Merge branch 'jc/test-sleepless'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 7faba2386f89b3f1b310c4abe4d2f47e07bbdb2c..3521637b582687978c088dc463e8784817a92217 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -109,6 +109,7 @@ OPTIONS
        Identify the file status with the following tags (followed by
        a space) at the start of each line:
        H::     cached
+       S::     skip-worktree
        M::     unmerged
        R::     removed/deleted
        C::     modified/changed
@@ -140,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>