Sync with maint

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 798e5d5b4f740bf7d579f37df787b315164bffb6..5abdbaa51cf58e216bbc63d28039a5abfba01669 100644 (file)
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -24,6 +24,9 @@ OPTIONS
        paths.  If this option is used, then 'unspecified' attributes
        will not be included in the output.
 
+--cached::
+       Consider `.gitattributes` in the index only, ignoring the working tree.
+
 --stdin::
        Read file names from stdin instead of from the command-line.
 
@@ -33,8 +36,11 @@ OPTIONS
 
 \--::
        Interpret all preceding arguments as attributes and all following
-       arguments as path names. If not supplied, only the first argument will
-       be treated as an attribute.
+       arguments as path names.
+
+If none of `--stdin`, `--all`, or `--` is used, the first argument
+will be treated as an attribute and the rest of the arguments as
+pathnames.
 
 OUTPUT
 ------