Autogenerated HTML docs for v1.6.0.3-578-g6a50

1 files changed, 3 insertions, 1 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 55ff99565..36e10e9d9 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -530,6 +530,7 @@ and applicable).</p></div>
 <div class="para"><p>In the check-out codepath, the blob content is first converted

 with <tt>crlf</tt>, and then <tt>ident</tt> and fed to <tt>filter</tt>.</p></div>

 <h3 id="_generating_diff_text">Generating diff text</h3><div style="clear:left"></div>

+<h4 id="_tt_diff_tt"><tt>diff</tt></h4>

 <div class="para"><p>The attribute <tt>diff</tt> affects if <em>git-diff</em> generates textual

 patch for the path or just says <tt>Binary files differ</tt>.  It also

 can affect what line is shown on the hunk header <tt>@@ -k,l +n,m @@</tt>

@@ -678,6 +679,7 @@ patterns are available:</p></div>
 </li>

 </ul></div>

 <h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div>

+<h4 id="_tt_merge_tt"><tt>merge</tt></h4>

 <div class="para"><p>The attribute <tt>merge</tt> affects how three versions of a file is

 merged when a file-level merge is necessary during <tt>git merge</tt>,

 and other programs such as <tt>git revert</tt> and <tt>git cherry-pick</tt>.</p></div>

@@ -948,7 +950,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-10-31 11:28:59 UTC

+Last updated 2008-11-02 18:16:23 UTC

 </div>

 </div>

 </body>