Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 043274b1b71cb9fbced92fabca16acc4453f6458..8c2ac12f5d316a5db8c5a9be2c4d9639ca30653b 100644 (file)
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -8,7 +8,9 @@ git-check-attr - Display gitattributes information
 
 SYNOPSIS
 --------
+[verse]
 'git check-attr' attr... [--] pathname...
+'git check-attr' --stdin [-z] attr... < <list-of-paths>
 
 DESCRIPTION
 -----------
@@ -17,6 +19,13 @@ For every pathname, this command will list if each attr is 'unspecified',
 
 OPTIONS
 -------
+--stdin::
+       Read file names from stdin instead of from the command-line.
+
+-z::
+       Only meaningful with `--stdin`; paths are separated with
+       NUL character instead of LF.
+
 \--::
        Interpret all preceding arguments as attributes, and all following
        arguments as path names. If not supplied, only the first argument will