Merge branch 'master' into next

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index e5a92f47dd086d3db2a7248673816998311b3f12..e813f8420275f5b95810646c2a43c35f57a5ba70 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -15,6 +15,7 @@ SYNOPSIS
                [-x <pattern>|--exclude=<pattern>]
                [-X <file>|--exclude-from=<file>]
                [--exclude-per-directory=<file>] 
+               [--error-unmatch]
                [--full-name] [--] [<file>]\*
 
 DESCRIPTION
@@ -73,6 +74,10 @@ OPTIONS
        read additional exclude patterns that apply only to the
        directory and its subdirectories in <file>.
 
+--error-unmatch::
+       If any <file> does not appear in the index, treat this as an
+       error (return 1).
+
 -t::
        Identify the file status with the following tags (followed by
        a space) at the start of each line:
@@ -81,7 +86,7 @@ OPTIONS
        R::     removed/deleted
        C::     modified/changed
        K::     to be killed
-       ?       other
+       ?::     other
 
 -v::
        Similar to `-t`, but use lowercase letters for files