diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-21 18:30:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-21 18:30:15 (GMT) |
| commit | d16c37964c284fa599251caafb51128c0df925a9 (patch) | |
| tree | db263d90e0dbc99e56ea50b359e16ab68d1531cc | |
| parent | d17811154b2482bae3fd089f29528e7b7b7ce62b (diff) | |
| parent | b635ed97a06e10e6b562d8a4356444ac8e31dce8 (diff) | |
| download | git-d16c37964c284fa599251caafb51128c0df925a9.zip git-d16c37964c284fa599251caafb51128c0df925a9.tar.gz git-d16c37964c284fa599251caafb51128c0df925a9.tar.bz2 | |
Merge branch 'jk/attributes-path-doc'
Doc update.
* jk/attributes-path-doc:
doc/gitattributes: mention non-recursive behavior
| -rw-r--r-- | Documentation/gitattributes.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index d52b254..1094fe2 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -56,9 +56,16 @@ Unspecified:: 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. +attribute. + +The rules by which the pattern matches paths are the same as in +`.gitignore` files (see linkgit:gitignore[5]), with a few exceptions: + + - negative patterns are forbidden + + - patterns that match a directory do not recursively match paths + inside that directory (so using the trailing-slash `path/` syntax is + pointless in an attributes file; use `path/**` instead) When deciding what attributes are assigned to a path, Git consults `$GIT_DIR/info/attributes` file (which has the highest |