gitattributes documentation: clarify overriding

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index d2edb9b14ae8fa0716d7139022ad4c7f61b355ed..857d55a409b80f0beaa8b98e1e04f922798241e3 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -49,10 +49,12 @@ Set to a value::
 Unspecified::
 
        No glob pattern matches the path, and nothing says if
 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
 
 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
 
 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
        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
 
 
 Defining a custom merge driver