Autogenerated HTML docs for v1.3.0-rc2-gae5d

diff --git a/diff-options.txt b/diff-options.txt
index 2a0275eeda19b7af50e22f0709e6a31afee10b5e..ec6811c71885a9aa0a28626c46e0645cd79864ac 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -69,6 +69,10 @@
        changeset, not just the files that contain the change
        in <string>.
 
+--pickaxe-regex::
+       Make the <string> not a plain string but an extended POSIX
+       regex to match.
+
 -O<orderfile>::
        Output the patch in the order specified in the
        <orderfile>, which has one shell glob pattern per line.

diff --git a/git-commit.html b/git-commit.html
index 16f2211fd5b24ceda54248c3fcddc51bf8e49ff3..08d93db495f85f6c53309435484a932777285ec5 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
-           [-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
@@ -380,6 +381,29 @@ information.</p>
 </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</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
@@ -482,7 +506,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Mar-2006 07:45:35 UTC\r
+Last updated 05-Apr-2006 21:43:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index d04b342a95037378e94bd89be933130909700456..2af472a5691007296ffb3a3c0921ab27e23e3884 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -9,7 +9,8 @@ SYNOPSIS
 --------
 [verse]
 'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
-          [-e] [--author <author>] [--] [[-i | -o ]<file>...]
+          [--no-verify] [--amend] [-e] [--author <author>]
+          [--] [[-i | -o ]<file>...]
 
 DESCRIPTION
 -----------
@@ -71,6 +72,27 @@ OPTIONS
        commit log message unmodified.  This option lets you
        further edit the message taken from these sources.
 
+--amend::
+
+       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 -- if it was a merge, it will have the parents of
+       the current tip as parents -- so the current top commit is
+       discarded.
++
+It is a rough equivalent for:
++
+------------
+       $ git reset --soft HEAD^
+       $ ... do something else to come up with the right tree ...
+       $ git commit -c ORIG_HEAD
+------------
++
+but can be used to amend a merge commit.
+
 -i|--include::
        Instead of committing only the files specified on the
        command line, update them in the index file and then

diff --git a/git-diff-files.html b/git-diff-files.html
index 1f7197aa9952739fe2c06d86d06c9cad455fe751..6af9abeb37457562bba7db3d816c7690a111f56d 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -431,6 +431,15 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>\r
 </dd>\r
 <dt>\r
+--pickaxe-regex\r
+</dt>\r
+<dd>\r
+<p>\r
+        Make the &lt;string&gt; not a plain string but an extended POSIX\r
+        regex to match.\r
+</p>\r
+</dd>\r
+<dt>\r
 -O&lt;orderfile&gt;\r
 </dt>\r
 <dd>\r
@@ -805,7 +814,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Feb-2006 05:51:45 UTC\r
+Last updated 05-Apr-2006 21:43:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 0523b06033f8ed5a190dc74563a0df284ff3b27f..8e0758796817f7b35093645715558ee3f136169b 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -432,6 +432,15 @@ entries in the index are compared.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--pickaxe-regex\r
+</dt>\r
+<dd>\r
+<p>\r
+        Make the &lt;string&gt; not a plain string but an extended POSIX\r
+        regex to match.\r
+</p>\r
+</dd>\r
+<dt>\r
 -O&lt;orderfile&gt;\r
 </dt>\r
 <dd>\r
@@ -895,7 +904,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Feb-2006 05:51:45 UTC\r
+Last updated 05-Apr-2006 21:43:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index c57b71e745ed1e7515315cd4df4ced3446e14528..1fd8955c35f85ab91517513f298c071e93768904 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -429,6 +429,15 @@ unmerged index file.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--pickaxe-regex\r
+</dt>\r
+<dd>\r
+<p>\r
+        Make the &lt;string&gt; not a plain string but an extended POSIX\r
+        regex to match.\r
+</p>\r
+</dd>\r
+<dt>\r
 -O&lt;orderfile&gt;\r
 </dt>\r
 <dd>\r
@@ -779,7 +788,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Mar-2006 00:31:24 UTC\r
+Last updated 05-Apr-2006 21:43:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 4ced0304003a7e0211780ee2ac5ee1d3f8b771d0..508d336c98419f784cf43cda9ca891815f7a50a6 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -434,6 +434,15 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--pickaxe-regex\r
+</dt>\r
+<dd>\r
+<p>\r
+        Make the &lt;string&gt; not a plain string but an extended POSIX\r
+        regex to match.\r
+</p>\r
+</dd>\r
+<dt>\r
 -O&lt;orderfile&gt;\r
 </dt>\r
 <dd>\r
@@ -955,7 +964,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Feb-2006 05:51:47 UTC\r
+Last updated 05-Apr-2006 21:43:20 UTC\r
 </div>\r
 </div>\r
 </body>\r