Autogenerated HTML docs for v1.4.0-rc1

[git.git] / git-commit.html

diff --git a/git-commit.html b/git-commit.html
index 16f2211..abf9e09 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -274,7 +274,8 @@ git-commit(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-commit</em> [-a] [-s] [-v] [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt;]\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-commit</em> [-a] [-s] [-v] [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt;]\r

-           [-e] [--author &lt;author&gt;] [--] [[-i | -o ]&lt;file&gt;&#8230;]</div></div>\r
+           [--no-verify] [--amend] [-e] [--author &lt;author&gt;]\r
+           [--] [[-i | -o ]&lt;file&gt;&#8230;]</div></div>\r

 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r


@@ -380,6 +381,30 @@ information.</p>
 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r

+--amend\r
+</dt>\r
+<dd>\r
+<p>\r
+        Used to amend the tip of the current branch. Prepare the tree\r
+        object you would want to replace the latest commit as usual\r
+        (this includes the usual -i/-o and explicit paths), and the\r
+        commit log editor is seeded with the commit message from the\r
+        tip of the current branch. The commit you create replaces the\r
+        current tip &#8212; if it was a merge, it will have the parents of\r
+        the current tip as parents &#8212; so the current top commit is\r
+        discarded.\r
+</p>\r
+<p>It is a rough equivalent for:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        $ git reset --soft HEAD^\r
+        $ ... do something else to come up with the right tree ...\r
+        $ git commit -c ORIG_HEAD\r
+</tt></pre>\r
+</div></div>\r
+<p>but can be used to amend a merge commit.</p>\r
+</dd>\r
+<dt>\r

 -i|--include\r
 </dt>\r
 <dd>\r
 -i|--include\r
 </dt>\r
 <dd>\r


@@ -387,7 +412,7 @@ information.</p>
         Instead of committing only the files specified on the\r
         command line, update them in the index file and then\r
         commit the whole index.  This is the traditional\r
         Instead of committing only the files specified on the\r
         command line, update them in the index file and then\r
         commit the whole index.  This is the traditional\r

-        behaviour.\r
+        behavior.\r

 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r


@@ -402,7 +427,7 @@ information.</p>
 </p>\r
 </dd>\r
 <dt>\r
 </p>\r
 </dd>\r
 <dt>\r

-&#8212;\r
+--\r

 </dt>\r
 <dd>\r
 <p>\r
 </dt>\r
 <dd>\r
 <p>\r


@@ -482,7 +507,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r

-Last updated 18-Mar-2006 07:45:35 UTC\r
+Last updated 04-Jun-2006 07:24:22 UTC\r

 </div>\r
 </div>\r
 </body>\r
 </div>\r
 </div>\r
 </body>\r