mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitattributes documentation: clarify overriding

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2007-04-24 13:46:02 -07:00
parent 886a39074b
commit b9d14ffbf1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/gitattributes.txt
View File

@ -49,10 +49,12 @@ Set to a value::
Unspecified:: Unspecified::
No glob pattern matches the path, and nothing says if 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 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 When deciding what attributes are assigned to a path, git
consults `$GIT_DIR/info/attributes` file (which has the highest 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 merge driver. The built-in 3-way merge driver can be
explicitly specified by asking for "text" driver; the explicitly specified by asking for "text" driver; the
built-in "take the current branch" driver can be built-in "take the current branch" driver can be
requested by "binary". requested with "binary".
Defining a custom merge driver Defining a custom merge driver