Autogenerated HTML docs for v1.5.2-rc0-34-gda94

diff --git a/gitattributes.html b/gitattributes.html
index 53f5b37a4790fe0fd3f661a794341f6763694ef1..7019ee16827f9e113372d0e41d50d4afc65722e1 100644 (file)
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -326,12 +326,14 @@ Unspecified
 <dd>\r
 <p>\r
         No glob pattern matches the path, and nothing says if\r
-        the path has or does not have the attribute.\r
+        the path has or does not have the attribute, the\r
+        attribute for the path is said to be Unspecified.\r
 </p>\r
 </dd>\r
 </dl>\r
 <p>When more than one glob pattern matches the path, a later line\r
-overrides an earlier line.</p>\r
+overrides an earlier line.  This overriding is done per\r
+attribute.</p>\r
 <p>When deciding what attributes are assigned to a path, git\r
 consults <tt>$GIT_DIR/info/attributes</tt> file (which has the highest\r
 precedence), <tt>.gitattributes</tt> file in the same directory as the\r
@@ -517,7 +519,7 @@ String
         merge driver.  The built-in 3-way merge driver can be\r
         explicitly specified by asking for "text" driver; the\r
         built-in "take the current branch" driver can be\r
-        requested by "binary".\r
+        requested with "binary".\r
 </p>\r
 </dd>\r
 </dl>\r
@@ -614,7 +616,7 @@ frotz   unspecified</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Apr-2007 07:26:51 UTC\r
+Last updated 25-Apr-2007 05:59:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitattributes.txt b/gitattributes.txt
index d2edb9b14ae8fa0716d7139022ad4c7f61b355ed..857d55a409b80f0beaa8b98e1e04f922798241e3 100644 (file)
--- a/gitattributes.txt
+++ b/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