Autogenerated HTML docs for v1.7.2.2-268-g7e423

1 files changed, 15 insertions, 1 deletions

diff --git a/git-rebase.html b/git-rebase.html
index e690fa11f..1b73dd059 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -498,6 +498,14 @@ rebase.stat
         rebase. False by default.

 </p>

 </dd>

+<dt>

+rebase.autosquash

+</dt>

+<dd>

+<p>

+        If set to true enable <em>--autosquash</em> option by default.

+</p>

+</dd>

 </dl></div>

 </div>

 <h2 id="_options">OPTIONS</h2>

@@ -758,6 +766,9 @@ idea unless you know what you are doing (see BUGS below).</p></div>
 <dt>

 --autosquash

 </dt>

+<dt>

+--no-autosquash

+</dt>

 <dd>

 <p>

         When the commit log message begins with "squash! &#8230;" (or

@@ -768,6 +779,9 @@ idea unless you know what you are doing (see BUGS below).</p></div>
         commit from <tt>pick</tt> to <tt>squash</tt> (or <tt>fixup</tt>).

 </p>

 <div class="para"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>

+<div class="para"><p>If the <em>--autosquash</em> option is enabled by default using the

+configuration variable <tt>rebase.autosquash</tt>, this option can be

+used to override and disable this setting.</p></div>

 </dd>

 <dt>

 --no-ff

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-08-22 07:24:54 UTC

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

 </div>

 </div>

 </body>