Merge branch 'jc/rebase-limit'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index e42af5ebe2052ad82af362ca7ffd3b6f93af4488..fe5341295c55af55d521454ac5ae98b225f1eb32 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -46,6 +46,10 @@ OPTIONS
 -s|--stage::
        Show stage files in the output
 
+--directory::
+       If a whole directory is classified as "other", show just its
+       name (with a trailing slash) and not its whole contents.
+
 -u|--unmerged::
        Show unmerged files in the output (forces --stage)
 
@@ -76,7 +80,7 @@ OPTIONS
        R::     removed/deleted
        C::     modified/changed
        K::     to be killed
-       ?       other
+       ?::     other
 
 --full-name::
        When run from a subdirectory, the command usually