Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 0f2cee7c265c75a592e43506a1f11d295b69ca06..8461c0e83e9d535b25755be1d5045cdc30145cb4 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -53,7 +53,8 @@ OPTIONS
        Show only ignored files in the output. When showing files in the
        index, print only those matched by an exclude pattern. When
        showing "other" files, show only those matched by an exclude
-       pattern.
+       pattern. Standard ignore rules are not automatically activated,
+       therefore at least one of the `--exclude*` options is required.
 
 -s::
 --stage::
@@ -117,6 +118,7 @@ OPTIONS
        linkgit:git-status[1] `--short` or linkgit:git-diff[1]
        `--name-status` for more user-friendly alternatives.
 +
+--
 This option identifies the file status with the following tags (followed by
 a space) at the start of each line:
 
@@ -127,6 +129,7 @@ a space) at the start of each line:
        C::     modified/changed
        K::     to be killed
        ?::     other
+--
 
 -v::
        Similar to `-t`, but use lowercase letters for files