Merge branch 'sz/maint-curl-multi-timeout'

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index ba02d4de5901b4448411654ecdf76a1b1980e53b..2698f63cf9b492deb32b09e2a60c59f500c47f5c 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -56,6 +56,7 @@ When more than one pattern matches the path, a later line
 overrides an earlier line.  This overriding is done per
 attribute.  The rules how the pattern matches paths are the
 same as in `.gitignore` files; see linkgit:gitignore[5].
+Unlike `.gitignore`, negative patterns are forbidden.
 
 When deciding what attributes are assigned to a path, git
 consults `$GIT_DIR/info/attributes` file (which has the highest