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

1 files changed, 6 insertions, 4 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 53f5b37a4..7019ee168 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -326,12 +326,14 @@ Unspecified
 <dd>

 <p>

         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.

 </p>

 </dd>

 </dl>

 <p>When more than one glob pattern matches the path, a later line

-overrides an earlier line.</p>

+overrides an earlier line.  This overriding is done per

+attribute.</p>

 <p>When deciding what attributes are assigned to a path, git

 consults <tt>$GIT_DIR/info/attributes</tt> file (which has the highest

 precedence), <tt>.gitattributes</tt> file in the same directory as the

@@ -517,7 +519,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".

 </p>

 </dd>

 </dl>

@@ -614,7 +616,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 23-Apr-2007 07:26:51 UTC

+Last updated 25-Apr-2007 05:59:11 UTC

 </div>

 </div>

 </body>