Permalink
Browse files

gitattributes documentation: clarify overriding

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information...
1 parent 886a390 commit b9d14ffbf1f42eb80231d0378dd2f019a162c054 Junio C Hamano committed Apr 24, 2007
Showing with 5 additions and 3 deletions.
  1. +5 −3 Documentation/gitattributes.txt
@@ -49,10 +49,12 @@ Set to a value::
Unspecified::
No glob pattern matches the path, and nothing says if
- the path has or does not have the attribute.
+ the path has or does not have the attribute, the
+ attribute for the path is said to be Unspecified.
When more than one glob pattern matches the path, a later line
-overrides an earlier line.
+overrides an earlier line. This overriding is done per
+attribute.
When deciding what attributes are assigned to a path, git
consults `$GIT_DIR/info/attributes` file (which has the highest
@@ -215,7 +217,7 @@ String::
merge driver. The built-in 3-way merge driver can be
explicitly specified by asking for "text" driver; the
built-in "take the current branch" driver can be
- requested by "binary".
+ requested with "binary".
Defining a custom merge driver

0 comments on commit b9d14ff

Please sign in to comment.