Merge branch 'fc/show-non-empty-errors-in-test'

diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 1f7312a1895ae66901e5472132406d01303da1f8..a7be80d48bf6fd6928186116f00f3b48cf564041 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.
 
@@ -53,6 +56,11 @@ being queried and <info> can be either:
 'set';;                when the attribute is defined as true.
 <value>;;      when a value has been assigned to the attribute.
 
+Buffering happens as documented under the `GIT_FLUSH` option in
+linkgit:git[1].  The caller is responsible for avoiding deadlocks
+caused by overfilling an input buffer or reading from an empty output
+buffer.
+
 EXAMPLES
 --------