Autogenerated HTML docs for v1.7.2.3-313-gcd15

1 files changed, 24 insertions, 2 deletions

diff --git a/git-rebase.html b/git-rebase.html
index 1b73dd059..d1dd4d5b0 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -521,7 +521,7 @@ rebase.autosquash
         <upstream>.  May be any valid commit, and not just an

         existing branch name.

 </p>

-<div class="para"><p>As a special case, you may use "A&#8230;B" as a shortcut for the

+<div class="para"><p>As a special case, you may use "A...B" as a shortcut for the

 merge base of A and B if there is exactly one merge base. You can

 leave out at most one of A and B, in which case it defaults to HEAD.</p></div>

 </dd>

@@ -860,6 +860,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>

@@ -1301,7 +1323,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-09-01 18:42:45 UTC

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

 </div>

 </div>

 </body>