Autogenerated HTML docs for v1.7.3.3-398-g0b0cd

1 files changed, 28 insertions, 5 deletions

diff --git a/git-commit.html b/git-commit.html
index a27c15d02..8b54d7972 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -416,10 +416,10 @@ git-commit(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <div class="verseblock-content"><em>git commit</em> [-a | --interactive] [-s] [-v] [-u&lt;mode&gt;] [--amend] [--dry-run]

-           [(-c | -C) &lt;commit&gt;] [-F &lt;file&gt; | -m &lt;msg&gt;] [--reset-author]

-           [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=&lt;author&gt;]

-           [--date=&lt;date&gt;] [--cleanup=&lt;mode&gt;] [--status | --no-status]

-           [-i | -o] [--] [&lt;file&gt;&#8230;]</div>

+           [(-c | -C | --fixup | --squash) &lt;commit&gt;] [-F &lt;file&gt; | -m &lt;msg&gt;]

+           [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify]

+           [-e] [--author=&lt;author&gt;] [--date=&lt;date&gt;] [--cleanup=&lt;mode&gt;]

+           [--status | --no-status] [-i | -o] [--] [&lt;file&gt;&#8230;]</div>

 <div class="verseblock-attribution">

 </div></div>

 </div>

@@ -515,6 +515,29 @@ that, you can recover from it with <em>git reset</em>.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--fixup=&lt;commit&gt;

+</dt>

+<dd>

+<p>

+        Construct a commit message for use with <tt>rebase --autosquash</tt>.

+        The commit message will be the subject line from the specified

+        commit with a prefix of "fixup! ".  See <a href="git-rebase.html">git-rebase(1)</a>

+        for details.

+</p>

+</dd>

+<dt class="hdlist1">

+--squash=&lt;commit&gt;

+</dt>

+<dd>

+<p>

+        Construct a commit message for use with <tt>rebase --autosquash</tt>.

+        The commit message subject line is taken from the specified

+        commit with a prefix of "squash! ".  Can be used with additional

+        commit message options (<tt>-m</tt>/<tt>-c</tt>/<tt>-C</tt>/<tt>-F</tt>). See

+        <a href="git-rebase.html">git-rebase(1)</a> for details.

+</p>

+</dd>

+<dt class="hdlist1">

 --reset-author

 </dt>

 <dd>

@@ -1100,7 +1123,7 @@ Junio C Hamano &lt;<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>&gt;<
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-12-02 14:18:06 UTC

+Last updated 2010-12-05 06:20:21 UTC

 </div>

 </div>

 </body>