gitattributes documentation: clarify overriding
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 24, 2007 at 13:46 UTC
b9d14ffbf1f42eb80231d0378dd2f019a162c054
1 file changed
+5
-3
Documentation/gitattributes.txt
+5
-3
@@ -49,10 +49,12 @@ Set to a value::
49
Unspecified::
50
51
No glob pattern matches the path, and nothing says if
52
- the path has or does not have the attribute.
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
-overrides an earlier line.
56
+overrides an earlier line. This overriding is done per
57
+attribute.
58
59
When deciding what attributes are assigned to a path, git
60
consults `$GIT_DIR/info/attributes` file (which has the highest
@@ -215,7 +217,7 @@ String::
217
merge driver. The built-in 3-way merge driver can be
218
explicitly specified by asking for "text" driver; the
219
built-in "take the current branch" driver can be
218
- requested by "binary".
220
+ requested with "binary".
221
222
223
Defining a custom merge driver