Autogenerated HTML docs for v1.3.0-rc2-gae5d

1 files changed, 26 insertions, 2 deletions

diff --git a/git-commit.html b/git-commit.html
index 16f2211fd..08d93db49 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -274,7 +274,8 @@ git-commit(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <div class="content"><em>git-commit</em> [-a] [-s] [-v] [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt;]

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

+           [--no-verify] [--amend] [-e] [--author &lt;author&gt;]

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

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

@@ -380,6 +381,29 @@ information.</p>
 </p>

 </dd>

 <dt>

+--amend

+</dt>

+<dd>

+<p>

+        Used to amend the tip of the current branch. Prepare the tree

+        object you would want to replace the latest commit as usual

+        (this includes the usual -i/-o and explicit paths), and the

+        commit log editor is seeded with the commit message from the

+        tip of the current branch. The commit you create replaces the

+        current tip &#8212; if it was a merge, it will have the parents of

+        the current tip as parents &#8212; so the current top commit is

+        discarded.

+</p>

+<p>It is a rough equivalent for:</p>

+<div class="listingblock">

+<div class="content">

+<pre><tt>        $ git reset --soft HEAD^

+        $ ... do something else to come up with the right tree ...

+        $ git commit -c ORIG_HEAD</tt></pre>

+</div></div>

+<p>but can be used to amend a merge commit.</p>

+</dd>

+<dt>

 -i|--include

 </dt>

 <dd>

@@ -482,7 +506,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 18-Mar-2006 07:45:35 UTC

+Last updated 05-Apr-2006 21:43:17 UTC

 </div>

 </div>

 </body>