gitattributes.txt: Path matching rules are explained in gitignore.txt
The rules how the patterns are matched against path names are the same for .gitattribute and .gitignore files. This also replace the notion "glob pattern" by "pattern" because gitignore.txt talks about "glob" only in some contexts where the pattern is mentioned. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Feb 25, 2009 at 08:54 UTC
3f74c8e8d8721d093655d7bb00ead078d8324100
1 file changed
+7
-6
Documentation/gitattributes.txt
+7
-6
@@ -18,10 +18,10 @@ A `gitattributes` file is a simple text file that gives
18
19
Each line in `gitattributes` file is of form:
20
21
- glob attr1 attr2 ...
21
+ pattern attr1 attr2 ...
22
23
-That is, a glob pattern followed by an attributes list,
24
-separated by whitespaces. When the glob pattern matches the
23
+That is, a pattern followed by an attributes list,
24
+separated by whitespaces. When the pattern matches the
25
path in question, the attributes listed on the line are given to
26
the path.
27
@@ -48,13 +48,14 @@ Set to a value::
48
49
Unspecified::
50
51
- No glob pattern matches the path, and nothing says if
51
+ No pattern matches the path, and nothing says if
52
the path has or does not have the attribute, the
53
attribute for the path is said to be Unspecified.
54
55
-When more than one glob pattern matches the path, a later line
55
+When more than one pattern matches the path, a later line
56
overrides an earlier line. This overriding is done per
57
-attribute.
57
+attribute. The rules how the pattern matches paths are the
58
+same as in `.gitignore` files; see linkgit:gitignore[5].
59
60
When deciding what attributes are assigned to a path, git
61
consults `$GIT_DIR/info/attributes` file (which has the highest