Autogenerated HTML docs for v1.5.6-rc2-15-g457bb

1 files changed, 21 insertions, 6 deletions

diff --git a/git-rebase.html b/git-rebase.html
index d8ac7ea28..c12560270 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -492,7 +492,10 @@ desired resolution, you can continue the rebasing process with</p>
 </p>

 </dd>

 <dt>

--m, --merge

+-m

+</dt>

+<dt>

+--merge

 </dt>

 <dd>

 <p>

@@ -502,7 +505,10 @@ desired resolution, you can continue the rebasing process with</p>
 </p>

 </dd>

 <dt>

--s &lt;strategy&gt;, --strategy=&lt;strategy&gt;

+-s &lt;strategy&gt;

+</dt>

+<dt>

+--strategy=&lt;strategy&gt;

 </dt>

 <dd>

 <p>

@@ -514,7 +520,10 @@ desired resolution, you can continue the rebasing process with</p>
 </p>

 </dd>

 <dt>

--v, --verbose

+-v

+</dt>

+<dt>

+--verbose

 </dt>

 <dd>

 <p>

@@ -542,7 +551,10 @@ desired resolution, you can continue the rebasing process with</p>
 </p>

 </dd>

 <dt>

--i, --interactive

+-i

+</dt>

+<dt>

+--interactive

 </dt>

 <dd>

 <p>

@@ -552,7 +564,10 @@ desired resolution, you can continue the rebasing process with</p>
 </p>

 </dd>

 <dt>

--p, --preserve-merges

+-p

+</dt>

+<dt>

+--preserve-merges

 </dt>

 <dd>

 <p>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 08-Jun-2008 01:34:02 UTC

+Last updated 08-Jun-2008 22:46:57 UTC

 </div>

 </div>

 </body>