Merge branch 'sp/ignorecase'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 01e7a578510f50af7365ec20e96d1538da424faa..13234fa280b279bfccad0a9aec6989727957567a 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -83,7 +83,8 @@ endif::git-format-patch[]
        Show only names of changed files.
 
 --name-status::
-       Show only names and status of changed files.
+       Show only names and status of changed files. See the description
+       of the `--diff-filter` option on what the status letters mean.
 
 --color::
        Show colored diff.