aboutsummaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-11-09 12:42:25 -0500
committerJeff King <peff@peff.net>2012-11-09 12:42:25 -0500
commit5f836422aba81b5a990ca5251892bfe26ec8125c (patch)
treed5eb91a8ead36a41c428b75c36ea8962837ebb86 /Documentation/gitattributes.txt
parent8736c9010c23fb1e903fc2b16351f18d477c56aa (diff)
parent82dce998c2028b6ee96691921b7037a6e182ec89 (diff)
downloadgit-5f836422aba81b5a990ca5251892bfe26ec8125c.tar.gz
git-5f836422aba81b5a990ca5251892bfe26ec8125c.tar.xz
Merge branch 'nd/attr-match-optim-more'
Start laying the foundation to build the "wildmatch" after we can agree on its desired semantics. * nd/attr-match-optim-more: attr: more matching optimizations from .gitignore gitignore: make pattern parsing code a separate function exclude: split pathname matching code into a separate function exclude: fix a bug in prefix compare optimization exclude: split basename matching code into a separate function exclude: stricten a length check in EXC_FLAG_ENDSWITH case
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index ba02d4de5..2698f63cf 100644
--- 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