Autogenerated HTML docs for v1.6.6.1-383-g5a9f

1 files changed, 19 insertions, 7 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 540b45003..01c27b900 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -407,9 +407,9 @@ operations are attributes-aware.</p></div>
 <h3 id="_checking_out_and_checking_in">Checking-out and checking-in</h3><div style="clear:left"></div>

 <div class="para"><p>These attributes affect how the contents stored in the

 repository are copied to the working tree files when commands

-such as <em>git-checkout</em> and <em>git-merge</em> run.  They also affect how

+such as <em>git checkout</em> and <em>git merge</em> run.  They also affect how

 git stores the contents you prepare in the working tree in the

-repository upon <em>git-add</em> and <em>git-commit</em>.</p></div>

+repository upon <em>git add</em> and <em>git commit</em>.</p></div>

 <h4 id="_tt_crlf_tt"><tt>crlf</tt></h4>

 <div class="para"><p>This attribute controls the line-ending convention.</p></div>

 <div class="vlist"><dl>

@@ -476,13 +476,13 @@ few exceptions.  Even though&#8230;</p></div>
 <div class="ilist"><ul>

 <li>

 <p>

-<em>git-add</em> itself does not touch the files in the work tree, the

+<em>git add</em> itself does not touch the files in the work tree, the

   next checkout would, so the safety triggers;

 </p>

 </li>

 <li>

 <p>

-<em>git-apply</em> to update a text file with a patch does touch the files

+<em>git apply</em> to update a text file with a patch does touch the files

   in the work tree, but the operation is about text files and CRLF

   conversion is about fixing the line ending inconsistencies, so the

   safety does not trigger;

@@ -490,8 +490,8 @@ few exceptions.  Even though&#8230;</p></div>
 </li>

 <li>

 <p>

-<em>git-diff</em> itself does not touch the files in the work tree, it is

-  often run to inspect the changes you intend to next <em>git-add</em>.  To

+<em>git diff</em> itself does not touch the files in the work tree, it is

+  often run to inspect the changes you intend to next <em>git add</em>.  To

   catch potential problems early, safety triggers.

 </p>

 </li>

@@ -881,6 +881,18 @@ driver to use when the merge driver is called for an internal
 merge between common ancestors, when there are more than one.

 When left unspecified, the driver itself is used for both

 internal merge and the final merge.</p></div>

+<h4 id="_tt_conflict_marker_size_tt"><tt>conflict-marker-size</tt></h4>

+<div class="para"><p>This attribute controls the length of conflict markers left in

+the work tree file during a conflicted merge.  Only setting to

+the value to a positive integer has any meaningful effect.</p></div>

+<div class="para"><p>For example, this line in <tt>.gitattributes</tt> can be used to tell the merge

+machinery to leave much longer (instead of the usual 7-character-long)

+conflict markers when merging the file <tt>Documentation/git-merge.txt</tt>

+results in a conflict.</p></div>

+<div class="listingblock">

+<div class="content">

+<pre><tt>Documentation/git-merge.txt     conflict-marker-size=32</tt></pre>

+</div></div>

 <h3 id="_checking_whitespace_errors">Checking whitespace errors</h3><div style="clear:left"></div>

 <h4 id="_tt_whitespace_tt"><tt>whitespace</tt></h4>

 <div class="para"><p>The <tt>core.whitespace</tt> configuration variable allows you to define what

@@ -1044,7 +1056,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-12-17 00:16:03 UTC

+Last updated 2010-01-21 17:44:41 UTC

 </div>

 </div>

 </body>