X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-commit.html;h=abf9e091865ab8cd8b0c284ee4aa802b9d0ef109;hb=f0a85daaf3d624dcf841cad8d5d243e6da55ea70;hp=f391cfff7f79055a3bb792f02bf12624b004fe08;hpb=40f2f8dd79c1622a7986e2ff2faa15c72860c79f;p=git.git

diff --git a/git-commit.html b/git-commit.html
index f391cfff..abf9e091 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -273,8 +273,9 @@ git-commit(1) Manual Page
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-commit</em> [-a] [-i] [-s] [-v] [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt;]
-           [-e] [--author &lt;author&gt;] [--] &lt;file&gt;&#8230;</div></div>
+<div class="content"><em>git-commit</em> [-a] [-s] [-v] [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt;]
+           [--no-verify] [--amend] [-e] [--author &lt;author&gt;]
+           [--] [[-i | -o ]&lt;file&gt;&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -282,6 +283,8 @@ git-commit(1) Manual Page
 <em>-a</em> is specified, and makes a commit object.  The command
 VISUAL and EDITOR environment variables to edit the commit log
 message.</p>
+<p>Several environment variable are used during commits.  They are
+documented in <a href="git-commit-tree.html">git-commit-tree(1)</a>.</p>
 <p>This command can run <tt>commit-msg</tt>, <tt>pre-commit</tt>, and
 <tt>post-commit</tt> hooks.  See <a href="hooks.html">hooks</a> for more
 information.</p>
@@ -378,6 +381,30 @@ 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>
@@ -385,11 +412,22 @@ information.</p>
         Instead of committing only the files specified on the
         command line, update them in the index file and then
         commit the whole index.  This is the traditional
-        behaviour.
+        behavior.
+</p>
+</dd>
+<dt>
+-o|--only
+</dt>
+<dd>
+<p>
+        Commit only the files specified on the command line.
+        This format cannot be used during a merge, nor when the
+        index and the latest commit does not match on the
+        specified paths to avoid confusion.
 </p>
 </dd>
 <dt>
-&#8212;
+--
 </dt>
 <dd>
 <p>
@@ -401,10 +439,9 @@ information.</p>
 </dt>
 <dd>
 <p>
-        Commit only the files specified on the command line.
-        This format cannot be used during a merge, nor when the
-        index and the latest commit does not match on the
-        specified paths to avoid confusion.
+        Files to be committed.  The meaning of these is
+        different between <tt>--include</tt> and <tt>--only</tt>.  Without
+        either, it defaults <tt>--only</tt> semantics.
 </p>
 </dd>
 </dl>
@@ -470,7 +507,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 07-Feb-2006 08:04:29 UTC
+Last updated 04-Jun-2006 07:24:22 UTC
 </div>
 </div>
 </body>