Skip to content

Commit

Permalink
gitattributes documentation: clarify overriding
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Apr 24, 2007
1 parent 886a390 commit b9d14ff
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Documentation/gitattributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b9d14ff

Please sign in to comment.