Merge branch 'bs/userdiff-php'

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 043274b1b71cb9fbced92fabca16acc4453f6458..50824e3a2d7d00370d7311088349da84ee23b728 100644 (file)
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -8,17 +8,26 @@ git-check-attr - Display gitattributes information
 
 SYNOPSIS
 --------
+[verse]
 'git check-attr' attr... [--] pathname...
+'git check-attr' --stdin [-z] attr... < <list-of-paths>
 
 DESCRIPTION
 -----------
-For every pathname, this command will list if each attr is 'unspecified',
+For every pathname, this command will list if each attribute is 'unspecified',
 'set', or 'unset' as a gitattribute on that pathname.
 
 OPTIONS
 -------
+--stdin::
+       Read file names from stdin instead of from the command-line.
+
+-z::
+       Only meaningful with `--stdin`; paths are separated with a
+       NUL character instead of a linefeed character.
+
 \--::
-       Interpret all preceding arguments as attributes, and all following
+       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.
 
@@ -28,12 +37,12 @@ OUTPUT
 The output is of the form:
 <path> COLON SP <attribute> COLON SP <info> LF
 
-Where <path> is the path of a file being queried, <attribute> is an attribute
+<path> is the path of a file being queried, <attribute> is an attribute
 being queried and <info> can be either:
 
 'unspecified';; when the attribute is not defined for the path.
-'unset';;      when the attribute is defined to false.
-'set';;                when the attribute is defined to true.
+'unset';;      when the attribute is defined as false.
+'set';;                when the attribute is defined as true.
 <value>;;      when a value has been assigned to the attribute.
 
 EXAMPLES
@@ -60,7 +69,7 @@ org/example/MyClass.java: diff: java
 org/example/MyClass.java: myAttr: set
 ---------------
 
-* Listing attribute for multiple files:
+* Listing an attribute for multiple files:
 ---------------
 $ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java
 org/example/MyClass.java: myAttr: set