Autogenerated HTML docs for v1.7.2.3-313-gcd15

1 files changed, 38 insertions, 1 deletions

diff --git a/git-merge.html b/git-merge.html
index 2250df541..af850647e 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -844,6 +844,28 @@ theirs
 </p>

 </dd>

 <dt>

+renormalize

+</dt>

+<dd>

+<p>

+        This runs a virtual check-out and check-in of all three stages

+        of a file when resolving a three-way merge.  This option is

+        meant to be used when merging branches with different clean

+        filters or end-of-line normalization rules.  See "Merging

+        branches with differing checkin/checkout attributes" in

+        <a href="gitattributes.html">gitattributes(5)</a> for details.

+</p>

+</dd>

+<dt>

+no-renormalize

+</dt>

+<dd>

+<p>

+        Disables the <tt>renormalize</tt> option.  This overrides the

+        <tt>merge.renormalize</tt> configuration variable.

+</p>

+</dd>

+<dt>

 subtree[=path]

 </dt>

 <dd>

@@ -932,6 +954,21 @@ merge.renameLimit
 </p>

 </dd>

 <dt>

+merge.renormalize

+</dt>

+<dd>

+<p>

+        Tell git that canonical representation of files in the

+        repository has changed over time (e.g. earlier commits record

+        text files with CRLF line endings, but recent ones use LF line

+        endings).  In such a repository, git can convert the data

+        recorded in commits to a canonical form before performing a

+        merge to reduce unnecessary conflicts.  For more information,

+        see section "Merging branches with differing checkin/checkout

+        attributes" in <a href="gitattributes.html">gitattributes(5)</a>.

+</p>

+</dd>

+<dt>

 merge.stat

 </dt>

 <dd>

@@ -1029,7 +1066,7 @@ branch.&lt;name&gt;.mergeoptions
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-07-21 21:55:29 UTC

+Last updated 2010-09-03 21:30:24 UTC

 </div>

 </div>

 </body>