Autogenerated HTML docs for v1.4.2.3-g128e

diff --git a/core-tutorial.html b/core-tutorial.html
index 7073b3a..88c3e5c 100644 (file)
--- a/core-tutorial.html
+++ b/core-tutorial.html
@@ -2011,7 +2011,7 @@ to follow, not easier.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Sep-2006 07:38:12 UTC\r
+Last updated 03-Oct-2006 08:41:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/cvs-migration.html b/cvs-migration.html
index 6560db4..fbcb550 100644 (file)
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -579,7 +579,7 @@ that contain this changed "if" statement:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Sep-2006 07:38:14 UTC\r
+Last updated 03-Oct-2006 08:41:45 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/diffcore.html b/diffcore.html
index 83eabfa..8914ec3 100644 (file)
--- a/diffcore.html
+++ b/diffcore.html
@@ -547,7 +547,7 @@ t</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:29 UTC\r
+Last updated 03-Oct-2006 08:41:46 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/everyday.html b/everyday.html
index 8fc5856..90ed11a 100644 (file)
--- a/everyday.html
+++ b/everyday.html
@@ -1067,7 +1067,7 @@ upload to public HTTP server hosted by your ISP.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:31 UTC\r
+Last updated 03-Oct-2006 08:41:48 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-add.html b/git-add.html
index ccb3da1..54254fa 100644 (file)
--- a/git-add.html
+++ b/git-add.html
@@ -388,7 +388,7 @@ git-add git-*.sh
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:29 UTC\r
+Last updated 03-Oct-2006 08:40:49 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-am.html b/git-am.html
index fa00411..b26e4b4 100644 (file)
--- a/git-am.html
+++ b/git-am.html
@@ -418,7 +418,7 @@ names.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:30 UTC\r
+Last updated 03-Oct-2006 08:40:50 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-annotate.html b/git-annotate.html
index e60bc8b..c3f2779 100644 (file)
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -338,7 +338,7 @@ which introduced the line. Optionally annotate from a given revision.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:30 UTC\r
+Last updated 03-Oct-2006 08:40:50 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.html b/git-apply.html
index 1fe0702..18c90e9 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -582,7 +582,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Sep-2006 02:46:59 UTC\r
+Last updated 03-Oct-2006 08:40:51 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-applymbox.html b/git-applymbox.html
index 7a7e6eb..27d48b6 100644 (file)
--- a/git-applymbox.html
+++ b/git-applymbox.html
@@ -391,7 +391,7 @@ current branch.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:31 UTC\r
+Last updated 03-Oct-2006 08:40:51 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-applypatch.html b/git-applypatch.html
index 7ca5ab3..54693ae 100644 (file)
--- a/git-applypatch.html
+++ b/git-applypatch.html
@@ -329,7 +329,7 @@ information.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:31 UTC\r
+Last updated 03-Oct-2006 08:40:51 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-archimport.html b/git-archimport.html
index b2af325..887acd2 100644 (file)
--- a/git-archimport.html
+++ b/git-archimport.html
@@ -410,7 +410,7 @@ patches that have been traded out-of-sequence between the branches.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:32 UTC\r
+Last updated 03-Oct-2006 08:40:52 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-archive.html b/git-archive.html
index 44215e7..8277f7f 100644 (file)
--- a/git-archive.html
+++ b/git-archive.html
@@ -444,7 +444,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Sep-2006 07:16:44 UTC\r
+Last updated 03-Oct-2006 08:40:52 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-bisect.html b/git-bisect.html
index 5991233..9e74990 100644 (file)
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -385,7 +385,7 @@ like this:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:32 UTC\r
+Last updated 03-Oct-2006 08:40:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-blame.html b/git-blame.html
index f809e1a..8259975 100644 (file)
--- a/git-blame.html
+++ b/git-blame.html
@@ -352,7 +352,7 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Aug-2006 08:43:06 UTC\r
+Last updated 03-Oct-2006 08:40:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.html b/git-branch.html
index f6a7d51..eb01693 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -421,7 +421,7 @@ a branch and check it out with a single command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:33 UTC\r
+Last updated 03-Oct-2006 08:40:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cat-file.html b/git-cat-file.html
index 1115c49..a7e9f78 100644 (file)
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -364,7 +364,7 @@ be returned.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:34 UTC\r
+Last updated 03-Oct-2006 08:40:54 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-check-ref-format.html b/git-check-ref-format.html
index 46828d2..b180309 100644 (file)
--- a/git-check-ref-format.html
+++ b/git-check-ref-format.html
@@ -343,7 +343,7 @@ colon <tt>:</tt> is used as in <tt>srcref:dstref</tt> to mean "use srcref's
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:35 UTC\r
+Last updated 03-Oct-2006 08:40:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout-index.html b/git-checkout-index.html
index 1a74e01..822b0cf 100644 (file)
--- a/git-checkout-index.html
+++ b/git-checkout-index.html
@@ -511,7 +511,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:34 UTC\r
+Last updated 03-Oct-2006 08:40:54 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.html b/git-checkout.html
index 255b2a5..34a981b 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -466,7 +466,7 @@ $ git update-index frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:35 UTC\r
+Last updated 03-Oct-2006 08:40:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 2278a6f..f4fd6b2 100644 (file)
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -346,7 +346,7 @@ effect to your working tree in a row.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:35 UTC\r
+Last updated 03-Oct-2006 08:40:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cherry.html b/git-cherry.html
index 65a3270..559f8c5 100644 (file)
--- a/git-cherry.html
+++ b/git-cherry.html
@@ -331,7 +331,7 @@ than pushing or pulling commits directly.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:36 UTC\r
+Last updated 03-Oct-2006 08:40:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clean.html b/git-clean.html
index 7fd8fa8..3a0ee3f 100644 (file)
--- a/git-clean.html
+++ b/git-clean.html
@@ -344,7 +344,7 @@ affected are further limited to those that match them.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:36 UTC\r
+Last updated 03-Oct-2006 08:40:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.html b/git-clone.html
index 4d5f3d7..ada479b 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -516,7 +516,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:37 UTC\r
+Last updated 03-Oct-2006 08:40:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit-tree.html b/git-commit-tree.html
index 73c14d3..cc4e1ee 100644 (file)
--- a/git-commit-tree.html
+++ b/git-commit-tree.html
@@ -403,7 +403,7 @@ Your sysadmin must hate you!
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:37 UTC\r
+Last updated 03-Oct-2006 08:40:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.html b/git-commit.html
index 4f3f54c..8d8a943 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -507,7 +507,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:38 UTC\r
+Last updated 03-Oct-2006 08:40:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-convert-objects.html b/git-convert-objects.html
index 6a389d8..cbd2307 100644 (file)
--- a/git-convert-objects.html
+++ b/git-convert-objects.html
@@ -292,7 +292,7 @@ git-convert-objects(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:38 UTC\r
+Last updated 03-Oct-2006 08:40:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-count-objects.html b/git-count-objects.html
index 45f120a..5392817 100644 (file)
--- a/git-count-objects.html
+++ b/git-count-objects.html
@@ -309,7 +309,7 @@ them, to help you decide when it is a good time to repack.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:38 UTC\r
+Last updated 03-Oct-2006 08:40:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index e23b12e..0447fa0 100644 (file)
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -386,7 +386,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 24-Jul-2006 08:24:53 UTC\r
+Last updated 03-Oct-2006 08:40:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 6cb3f17..182f6db 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -478,7 +478,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Aug-2006 21:12:15 UTC\r
+Last updated 03-Oct-2006 08:40:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsserver.html b/git-cvsserver.html
index 0c3ae29..ad90a7c 100644 (file)
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -442,7 +442,7 @@ No keyword expansion or newline munging is supported.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:40 UTC\r
+Last updated 03-Oct-2006 08:40:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-daemon.html b/git-daemon.html
index 0002d8a..803be66 100644 (file)
--- a/git-daemon.html
+++ b/git-daemon.html
@@ -607,7 +607,7 @@ they correspond to these IP addresses.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Sep-2006 07:39:09 UTC\r
+Last updated 03-Oct-2006 08:40:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.html b/git-describe.html
index 24b6c84..f745bac 100644 (file)
--- a/git-describe.html
+++ b/git-describe.html
@@ -367,7 +367,7 @@ butchered by Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:41 UTC\r
+Last updated 03-Oct-2006 08:41:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.html b/git-diff-files.html
index b6dd84e..1edeb7a 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -917,7 +917,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Oct-2006 05:40:07 UTC\r
+Last updated 03-Oct-2006 08:41:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index b6b41ea..3869938 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -1007,7 +1007,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Oct-2006 05:40:09 UTC\r
+Last updated 03-Oct-2006 08:41:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index cfc2d8c..9030aab 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -891,7 +891,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Oct-2006 05:40:10 UTC\r
+Last updated 03-Oct-2006 08:41:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 7a36ad0..6dc78cd 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1079,7 +1079,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Oct-2006 05:40:10 UTC\r
+Last updated 03-Oct-2006 08:41:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index cad021c..37b31bf 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -463,7 +463,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:45 UTC\r
+Last updated 03-Oct-2006 08:41:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fetch-pack.html b/git-fetch-pack.html
index 38ab0ac..2543a7c 100644 (file)
--- a/git-fetch-pack.html
+++ b/git-fetch-pack.html
@@ -368,7 +368,7 @@ have a common ancestor commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:45 UTC\r
+Last updated 03-Oct-2006 08:41:04 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fetch.html b/git-fetch.html
index bbfa2a7..bd635fd 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -607,7 +607,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:45 UTC\r
+Last updated 03-Oct-2006 08:41:04 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 520e0bf..90b335b 100644 (file)
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -300,7 +300,7 @@ automatically invoking <tt>git-merge</tt>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:46 UTC\r
+Last updated 03-Oct-2006 08:41:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.html b/git-format-patch.html
index 5595286..5442377 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -450,7 +450,7 @@ git-format-patch -M -B origin
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Jul-2006 22:23:03 UTC\r
+Last updated 03-Oct-2006 08:41:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fsck-objects.html b/git-fsck-objects.html
index a053ed2..fe336df 100644 (file)
--- a/git-fsck-objects.html
+++ b/git-fsck-objects.html
@@ -491,7 +491,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:47 UTC\r
+Last updated 03-Oct-2006 08:41:05 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html
index 7260a18..4c79c32 100644 (file)
--- a/git-get-tar-commit-id.html
+++ b/git-get-tar-commit-id.html
@@ -298,7 +298,7 @@ a tree ID instead of a commit ID or tag.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:47 UTC\r
+Last updated 03-Oct-2006 08:41:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.html b/git-grep.html
index b0829bb..7157465 100644 (file)
--- a/git-grep.html
+++ b/git-grep.html
@@ -483,7 +483,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Sep-2006 18:15:57 UTC\r
+Last updated 03-Oct-2006 08:41:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-hash-object.html b/git-hash-object.html
index d0973ec..f3097eb 100644 (file)
--- a/git-hash-object.html
+++ b/git-hash-object.html
@@ -327,7 +327,7 @@ specified, it defaults to "blob".</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:48 UTC\r
+Last updated 03-Oct-2006 08:41:06 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-fetch.html b/git-http-fetch.html
index 0191d29..39a2d24 100644 (file)
--- a/git-http-fetch.html
+++ b/git-http-fetch.html
@@ -360,7 +360,7 @@ commit-id
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Jul-2006 09:10:04 UTC\r
+Last updated 03-Oct-2006 08:41:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-push.html b/git-http-push.html
index 934c5ee..687e213 100644 (file)
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -379,7 +379,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:49 UTC\r
+Last updated 03-Oct-2006 08:41:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-imap-send.html b/git-imap-send.html
index fcca345..2cf704a 100644 (file)
--- a/git-imap-send.html
+++ b/git-imap-send.html
@@ -320,7 +320,7 @@ configuration file (shown with examples):</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:49 UTC\r
+Last updated 03-Oct-2006 08:41:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-index-pack.html b/git-index-pack.html
index 00ec6d9..aaff699 100644 (file)
--- a/git-index-pack.html
+++ b/git-index-pack.html
@@ -313,7 +313,7 @@ objects/pack/ directory of a git repository.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:50 UTC\r
+Last updated 03-Oct-2006 08:41:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-init-db.html b/git-init-db.html
index e1d963a..5c79f9d 100644 (file)
--- a/git-init-db.html
+++ b/git-init-db.html
@@ -389,7 +389,7 @@ add all existing file to the index
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Sep-2006 08:13:17 UTC\r
+Last updated 03-Oct-2006 08:41:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-instaweb.html b/git-instaweb.html
index 475fd72..a8be792 100644 (file)
--- a/git-instaweb.html
+++ b/git-instaweb.html
@@ -388,7 +388,7 @@ repository.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:50 UTC\r
+Last updated 03-Oct-2006 08:41:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-local-fetch.html b/git-local-fetch.html
index 437fc3f..ed8a57a 100644 (file)
--- a/git-local-fetch.html
+++ b/git-local-fetch.html
@@ -351,7 +351,7 @@ git-local-fetch(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Jul-2006 09:10:04 UTC\r
+Last updated 03-Oct-2006 08:41:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index e7ddc5b..11ff7c2 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -384,7 +384,7 @@ git log -r --name-status release..test
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:51 UTC\r
+Last updated 03-Oct-2006 08:41:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-lost-found.html b/git-lost-found.html
index 5dc8490..be9bdd1 100644 (file)
--- a/git-lost-found.html
+++ b/git-lost-found.html
@@ -338,7 +338,7 @@ $ git rev-parse not-lost-anymore
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:52 UTC\r
+Last updated 03-Oct-2006 08:41:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-files.html b/git-ls-files.html
index 79d6adf..c12f43f 100644 (file)
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -688,7 +688,7 @@ from getting ignored.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:52 UTC\r
+Last updated 03-Oct-2006 08:41:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-remote.html b/git-ls-remote.html
index 8cc179f..298c172 100644 (file)
--- a/git-ls-remote.html
+++ b/git-ls-remote.html
@@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Aug-2006 08:43:06 UTC\r
+Last updated 03-Oct-2006 08:41:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-tree.html b/git-ls-tree.html
index 6c782fd..19ab13b 100644 (file)
--- a/git-ls-tree.html
+++ b/git-ls-tree.html
@@ -397,7 +397,7 @@ another major rewrite by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:53 UTC\r
+Last updated 03-Oct-2006 08:41:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mailinfo.html b/git-mailinfo.html
index 3099ef9..ec57b6d 100644 (file)
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -360,7 +360,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:54 UTC\r
+Last updated 03-Oct-2006 08:41:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mailsplit.html b/git-mailsplit.html
index e89ea22..3d9e565 100644 (file)
--- a/git-mailsplit.html
+++ b/git-mailsplit.html
@@ -344,7 +344,7 @@ and Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:54 UTC\r
+Last updated 03-Oct-2006 08:41:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-base.html b/git-merge-base.html
index cbcdf8a..d2a1e64 100644 (file)
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -312,7 +312,7 @@ relied on to decide in any particular way.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:54 UTC\r
+Last updated 03-Oct-2006 08:41:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-index.html b/git-merge-index.html
index e50a819..91fedf0 100644 (file)
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:55 UTC\r
+Last updated 03-Oct-2006 08:41:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-one-file.html b/git-merge-one-file.html
index 40fd658..4d41669 100644 (file)
--- a/git-merge-one-file.html
+++ b/git-merge-one-file.html
@@ -294,7 +294,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Petr Baudis &lt;pasky@suse.cz&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:55 UTC\r
+Last updated 03-Oct-2006 08:41:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-tree.html b/git-merge-tree.html
index 61b065d..77c6b52 100644 (file)
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -300,7 +300,7 @@ entries that match &lt;branch1&gt; tree.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:56 UTC\r
+Last updated 03-Oct-2006 08:41:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.html b/git-merge.html
index 230111b..cb7d62a 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -567,7 +567,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:56 UTC\r
+Last updated 03-Oct-2006 08:41:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mktag.html b/git-mktag.html
index 09ed267..be88ec4 100644 (file)
--- a/git-mktag.html
+++ b/git-mktag.html
@@ -309,7 +309,7 @@ size, you're doing something wrong)</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:57 UTC\r
+Last updated 03-Oct-2006 08:41:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mktree.html b/git-mktree.html
index d5031a4..39fb392 100644 (file)
--- a/git-mktree.html
+++ b/git-mktree.html
@@ -307,7 +307,7 @@ built is written to the standard output.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:57 UTC\r
+Last updated 03-Oct-2006 08:41:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-mv.html b/git-mv.html
index 90f771f..ab549e8 100644 (file)
--- a/git-mv.html
+++ b/git-mv.html
@@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:57 UTC\r
+Last updated 03-Oct-2006 08:41:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-name-rev.html b/git-name-rev.html
index 8dea9ca..c42f538 100644 (file)
--- a/git-name-rev.html
+++ b/git-name-rev.html
@@ -342,7 +342,7 @@ not the context.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:58 UTC\r
+Last updated 03-Oct-2006 08:41:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-p4import.html b/git-p4import.html
index a8374f2..99ab519 100644 (file)
--- a/git-p4import.html
+++ b/git-p4import.html
@@ -461,7 +461,7 @@ of mappings with each line containing one mapping in the format:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:58 UTC\r
+Last updated 03-Oct-2006 08:41:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.html b/git-pack-objects.html
index b0d8a16..96b86c9 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -446,7 +446,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Sep-2006 02:46:59 UTC\r
+Last updated 03-Oct-2006 08:41:15 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-redundant.html b/git-pack-redundant.html
index 03ae4e8..951c51d 100644 (file)
--- a/git-pack-redundant.html
+++ b/git-pack-redundant.html
@@ -335,7 +335,7 @@ objects.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:59 UTC\r
+Last updated 03-Oct-2006 08:41:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-parse-remote.html b/git-parse-remote.html
index cf97622..dece80c 100644 (file)
--- a/git-parse-remote.html
+++ b/git-parse-remote.html
@@ -324,7 +324,7 @@ get_remote_refs_for_push
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:00 UTC\r
+Last updated 03-Oct-2006 08:41:16 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-patch-id.html b/git-patch-id.html
index 2a101f8..c80073f 100644 (file)
--- a/git-patch-id.html
+++ b/git-patch-id.html
@@ -314,7 +314,7 @@ This can be used to make a mapping from patch ID to commit ID.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:00 UTC\r
+Last updated 03-Oct-2006 08:41:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-peek-remote.html b/git-peek-remote.html
index f01df0f..d9ce63d 100644 (file)
--- a/git-peek-remote.html
+++ b/git-peek-remote.html
@@ -333,7 +333,7 @@ stores them in the local repository under the same name.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:00 UTC\r
+Last updated 03-Oct-2006 08:41:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-prune-packed.html b/git-prune-packed.html
index 7873491..82685e5 100644 (file)
--- a/git-prune-packed.html
+++ b/git-prune-packed.html
@@ -317,7 +317,7 @@ disk storage, etc.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:01 UTC\r
+Last updated 03-Oct-2006 08:41:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-prune.html b/git-prune.html
index 4c26c8c..a10f50f 100644 (file)
--- a/git-prune.html
+++ b/git-prune.html
@@ -340,7 +340,7 @@ borrows from your repository via its
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:01 UTC\r
+Last updated 03-Oct-2006 08:41:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.html b/git-pull.html
index af0c260..cf2254f 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -809,7 +809,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:01 UTC\r
+Last updated 03-Oct-2006 08:41:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.html b/git-push.html
index 5c2e182..38c8156 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -502,7 +502,7 @@ Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Aug-2006 21:12:15 UTC\r
+Last updated 03-Oct-2006 08:41:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-quiltimport.html b/git-quiltimport.html
index 2435c60..c41b505 100644 (file)
--- a/git-quiltimport.html
+++ b/git-quiltimport.html
@@ -342,7 +342,7 @@ variable.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:03 UTC\r
+Last updated 03-Oct-2006 08:41:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-read-tree.html b/git-read-tree.html
index 047c5ef..bc765ea 100644 (file)
--- a/git-read-tree.html
+++ b/git-read-tree.html
@@ -662,7 +662,7 @@ have finished your work-in-progress), attempt the merge again.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:03 UTC\r
+Last updated 03-Oct-2006 08:41:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.html b/git-rebase.html
index 997b2ff..94d7caf 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -508,7 +508,7 @@ a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:04 UTC\r
+Last updated 03-Oct-2006 08:41:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-receive-pack.html b/git-receive-pack.html
index 7953794..db20937 100644 (file)
--- a/git-receive-pack.html
+++ b/git-receive-pack.html
@@ -367,7 +367,7 @@ tells it if updates to a ref should be denied if they are not fast-forwards.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Sep-2006 08:13:17 UTC\r
+Last updated 03-Oct-2006 08:41:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-relink.html b/git-relink.html
index 31c2000..133a736 100644 (file)
--- a/git-relink.html
+++ b/git-relink.html
@@ -315,7 +315,7 @@ if they are hardlinked, and replace one with a hardlink to the other if not.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:05 UTC\r
+Last updated 03-Oct-2006 08:41:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repack.html b/git-repack.html
index 1e760fa..952693a 100644 (file)
--- a/git-repack.html
+++ b/git-repack.html
@@ -381,7 +381,7 @@ engines, disk storage, etc.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Sep-2006 02:47:00 UTC\r
+Last updated 03-Oct-2006 08:41:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repo-config.html b/git-repo-config.html
index 0c7ae0e..9859180 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -1036,7 +1036,7 @@ receive.denyNonFastforwads
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Oct-2006 09:55:03 UTC\r
+Last updated 03-Oct-2006 08:41:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-request-pull.html b/git-request-pull.html
index 51290cb..46471fd 100644 (file)
--- a/git-request-pull.html
+++ b/git-request-pull.html
@@ -322,7 +322,7 @@ the given URL in the generated summary.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:07 UTC\r
+Last updated 03-Oct-2006 08:41:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rerere.html b/git-rerere.html
index 1ff5ab7..e311b61 100644 (file)
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -431,7 +431,7 @@ conflict.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:07 UTC\r
+Last updated 03-Oct-2006 08:41:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-reset.html b/git-reset.html
index 51affa4..2fbdefa 100644 (file)
--- a/git-reset.html
+++ b/git-reset.html
@@ -566,7 +566,7 @@ At this point the index file still has all the WIP changes you
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:07 UTC\r
+Last updated 03-Oct-2006 08:41:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-resolve.html b/git-resolve.html
index 48ba329..7c89c03 100644 (file)
--- a/git-resolve.html
+++ b/git-resolve.html
@@ -298,7 +298,7 @@ Dan Holmsand &lt;holmsand@gmail.com&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:08 UTC\r
+Last updated 03-Oct-2006 08:41:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.html b/git-rev-list.html
index c7304e8..1bd3ba1 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -645,7 +645,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Sep-2006 04:45:35 UTC\r
+Last updated 03-Oct-2006 08:41:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 9577bdf..c9005d7 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -514,7 +514,7 @@ A suffix <em>^</em> to a revision parameter means the first parent of
 </li>\r
 <li>\r
 <p>\r
-A suffix <em>~&lt;n&gt;</em> to a revision parameter means the commit\r
+A suffix <em>&#126;&lt;n&gt;</em> to a revision parameter means the commit\r
   object that is the &lt;n&gt;th generation grand-parent of the named\r
   commit object, following only the first parent.  I.e. rev~3 is\r
   equivalent to rev^^^ which is equivalent to  rev^1^1^1.\r
@@ -614,7 +614,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:09 UTC\r
+Last updated 03-Oct-2006 08:41:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index b761b4b..2f1306c 100644 (file)
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -138,7 +138,7 @@ syntax.
   'rev{caret}0' means the commit itself and is used when 'rev' is the
   object name of a tag object that refers to a commit object.
 
-* A suffix '~<n>' to a revision parameter means the commit
+* A suffix '{tilde}<n>' to a revision parameter means the commit
   object that is the <n>th generation grand-parent of the named
   commit object, following only the first parent.  I.e. rev~3 is
   equivalent to rev{caret}{caret}{caret} which is equivalent to\

diff --git a/git-revert.html b/git-revert.html
index 26bfd17..3238f54 100644 (file)
--- a/git-revert.html
+++ b/git-revert.html
@@ -343,7 +343,7 @@ effect to your working tree in a row.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:08 UTC\r
+Last updated 03-Oct-2006 08:41:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rm.html b/git-rm.html
index 57be79f..0c00258 100644 (file)
--- a/git-rm.html
+++ b/git-rm.html
@@ -399,7 +399,7 @@ git-rm -f git-*.sh
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:10 UTC\r
+Last updated 03-Oct-2006 08:41:26 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.html b/git-send-email.html
index 623451f..0a35b91 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -430,7 +430,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:10 UTC\r
+Last updated 03-Oct-2006 08:41:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-pack.html b/git-send-pack.html
index 3514542..9b2e2cc 100644 (file)
--- a/git-send-pack.html
+++ b/git-send-pack.html
@@ -410,7 +410,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:11 UTC\r
+Last updated 03-Oct-2006 08:41:27 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-sh-setup.html b/git-sh-setup.html
index fe778c8..701a4f1 100644 (file)
--- a/git-sh-setup.html
+++ b/git-sh-setup.html
@@ -299,7 +299,7 @@ use it as follows:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:13 UTC\r
+Last updated 03-Oct-2006 08:41:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shell.html b/git-shell.html
index 8db19d5..d15c849 100644 (file)
--- a/git-shell.html
+++ b/git-shell.html
@@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:11 UTC\r
+Last updated 03-Oct-2006 08:41:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shortlog.html b/git-shortlog.html
index f504f2b..ba0748b 100644 (file)
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -317,7 +317,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:12 UTC\r
+Last updated 03-Oct-2006 08:41:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-branch.html b/git-show-branch.html
index afd0867..631912b 100644 (file)
--- a/git-show-branch.html
+++ b/git-show-branch.html
@@ -480,7 +480,7 @@ your topic branch, it is shown as well.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:12 UTC\r
+Last updated 03-Oct-2006 08:41:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show-index.html b/git-show-index.html
index 9490c71..fbd573b 100644 (file)
--- a/git-show-index.html
+++ b/git-show-index.html
@@ -296,7 +296,7 @@ offset and SHA1 of each object.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:13 UTC\r
+Last updated 03-Oct-2006 08:41:29 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show.html b/git-show.html
index 7dc1d20..025f692 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -322,7 +322,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:13 UTC\r
+Last updated 03-Oct-2006 08:41:29 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ssh-fetch.html b/git-ssh-fetch.html
index 8697116..bce8432 100644 (file)
--- a/git-ssh-fetch.html
+++ b/git-ssh-fetch.html
@@ -349,7 +349,7 @@ commit-id
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:14 UTC\r
+Last updated 03-Oct-2006 08:41:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ssh-upload.html b/git-ssh-upload.html
index b7ff3c4..12e6ca5 100644 (file)
--- a/git-ssh-upload.html
+++ b/git-ssh-upload.html
@@ -348,7 +348,7 @@ commit-id
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:14 UTC\r
+Last updated 03-Oct-2006 08:41:30 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-status.html b/git-status.html
index 4794a1a..11e19fb 100644 (file)
--- a/git-status.html
+++ b/git-status.html
@@ -309,7 +309,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Aug-2006 00:17:59 UTC\r
+Last updated 03-Oct-2006 08:41:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-stripspace.html b/git-stripspace.html
index 37a2c33..a808582 100644 (file)
--- a/git-stripspace.html
+++ b/git-stripspace.html
@@ -305,7 +305,7 @@ git-stripspace(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:15 UTC\r
+Last updated 03-Oct-2006 08:41:31 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.html b/git-svn.html
index fd03854..cda5b2d 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -729,7 +729,7 @@ detect them.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Sep-2006 04:45:35 UTC\r
+Last updated 03-Oct-2006 08:41:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svnimport.html b/git-svnimport.html
index f55b6f0..5d815ad 100644 (file)
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -512,7 +512,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:15 UTC\r
+Last updated 03-Oct-2006 08:41:32 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html
index 6983e5f..2b13bae 100644 (file)
--- a/git-symbolic-ref.html
+++ b/git-symbolic-ref.html
@@ -314,7 +314,7 @@ changed at compilation time.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:16 UTC\r
+Last updated 03-Oct-2006 08:41:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tag.html b/git-tag.html
index 83bcf62..fe9fa97 100644 (file)
--- a/git-tag.html
+++ b/git-tag.html
@@ -371,7 +371,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:17 UTC\r
+Last updated 03-Oct-2006 08:41:33 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tar-tree.html b/git-tar-tree.html
index 6b32fcd..dd4e569 100644 (file)
--- a/git-tar-tree.html
+++ b/git-tar-tree.html
@@ -395,7 +395,7 @@ git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Sep-2006 04:45:36 UTC\r
+Last updated 03-Oct-2006 08:41:34 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tools.html b/git-tools.html
index bcdaf17..0fa4ac5 100644 (file)
--- a/git-tools.html
+++ b/git-tools.html
@@ -407,7 +407,7 @@ tweaking to work on XEmacs.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:32 UTC\r
+Last updated 03-Oct-2006 08:41:49 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-file.html b/git-unpack-file.html
index 3b3784a..aab08f0 100644 (file)
--- a/git-unpack-file.html
+++ b/git-unpack-file.html
@@ -307,7 +307,7 @@ returns the name of the temporary file in the following format:
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:18 UTC\r
+Last updated 03-Oct-2006 08:41:34 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index 881d3c5..be16f00 100644 (file)
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -333,7 +333,7 @@ new packs and replace existing ones.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Sep-2006 07:38:11 UTC\r
+Last updated 03-Oct-2006 08:41:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-index.html b/git-update-index.html
index 37ab2ff..ba8b41a 100644 (file)
--- a/git-update-index.html
+++ b/git-update-index.html
@@ -714,7 +714,7 @@ need to use <tt>git-update-index --chmod=</tt>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 24-Aug-2006 07:37:39 UTC\r
+Last updated 03-Oct-2006 08:41:35 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-ref.html b/git-update-ref.html
index 64e59f5..c60eb85 100644 (file)
--- a/git-update-ref.html
+++ b/git-update-ref.html
@@ -354,7 +354,7 @@ or does not have committer information available.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:19 UTC\r
+Last updated 03-Oct-2006 08:41:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-update-server-info.html b/git-update-server-info.html
index f8747fd..bc77efb 100644 (file)
--- a/git-update-server-info.html
+++ b/git-update-server-info.html
@@ -332,7 +332,7 @@ info/refs file unless <tt>--force</tt> flag is given.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:20 UTC\r
+Last updated 03-Oct-2006 08:41:36 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-upload-archive.html b/git-upload-archive.html
index d30c68a..c9ce087 100644 (file)
--- a/git-upload-archive.html
+++ b/git-upload-archive.html
@@ -309,7 +309,7 @@ is meant to be used to get an archive from a remote repository.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Sep-2006 10:34:06 UTC\r
+Last updated 03-Oct-2006 08:41:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-upload-pack.html b/git-upload-pack.html
index f9b2cad..43def60 100644 (file)
--- a/git-upload-pack.html
+++ b/git-upload-pack.html
@@ -310,7 +310,7 @@ repository.  For push operations, see <em>git-send-pack</em>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:20 UTC\r
+Last updated 03-Oct-2006 08:41:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-var.html b/git-var.html
index bfc251a..895b6ce 100644 (file)
--- a/git-var.html
+++ b/git-var.html
@@ -372,7 +372,7 @@ Your sysadmin must hate you!
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:21 UTC\r
+Last updated 03-Oct-2006 08:41:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-verify-pack.html b/git-verify-pack.html
index 6df8ea7..aa0988c 100644 (file)
--- a/git-verify-pack.html
+++ b/git-verify-pack.html
@@ -338,7 +338,7 @@ corresponding pack file.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:21 UTC\r
+Last updated 03-Oct-2006 08:41:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-verify-tag.html b/git-verify-tag.html
index 8256fec..be9c520 100644 (file)
--- a/git-verify-tag.html
+++ b/git-verify-tag.html
@@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:22 UTC\r
+Last updated 03-Oct-2006 08:41:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-whatchanged.html b/git-whatchanged.html
index bb14e75..9f106ef 100644 (file)
--- a/git-whatchanged.html
+++ b/git-whatchanged.html
@@ -384,7 +384,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:22 UTC\r
+Last updated 03-Oct-2006 08:41:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-write-tree.html b/git-write-tree.html
index 81ee889..b09ce64 100644 (file)
--- a/git-write-tree.html
+++ b/git-write-tree.html
@@ -323,7 +323,7 @@ now, you need to have done a <tt>git-update-index</tt> phase before you did the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:22 UTC\r
+Last updated 03-Oct-2006 08:41:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.html b/git.html
index 7cded85..0cfc4fd 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2172,7 +2172,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Sep-2006 07:16:44 UTC\r
+Last updated 03-Oct-2006 08:41:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitk.html b/gitk.html
index 2b32c8c..e835d27 100644 (file)
--- a/gitk.html
+++ b/gitk.html
@@ -423,7 +423,7 @@ gitk --max-count=100 --all — Makefile
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 20-Sep-2006 21:29:18 UTC\r
+Last updated 03-Oct-2006 08:41:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/glossary.html b/glossary.html
index a62b4e2..dcdcdb2 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -950,7 +950,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:32 UTC\r
+Last updated 03-Oct-2006 08:41:49 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/hooks.html b/hooks.html
index 0bd6d2f..2465615 100644 (file)
--- a/hooks.html
+++ b/hooks.html
@@ -406,7 +406,7 @@ you can redirect your output to your <tt>stderr</tt>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 20-Sep-2006 21:29:19 UTC\r
+Last updated 03-Oct-2006 08:41:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/howto-index.html b/howto-index.html
index 3ec1989..5b4f072 100644 (file)
--- a/howto-index.html
+++ b/howto-index.html
@@ -365,7 +365,7 @@ as a Linux subsystem maintainer.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 11-Aug-2006 00:00:18 UTC\r
+Last updated 03-Oct-2006 08:41:46 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 6a33c6a..ae699d6 100644 (file)
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -255,17 +255,192 @@ div.exampleblock-content {
   padding-left: 0.5em;\r
 }\r
 </style>\r
+<title>Reverting an existing commit</title>\r
 </head>\r
 <body>\r
 <div id="header">\r
+<h1>Reverting an existing commit</h1>\r
+</div>\r
+<div id="preamble">\r
+<div class="sectionbody">\r
+<p>One of the changes I pulled into the <em>master</em> branch turns out to\r
+break building GIT with GCC 2.95.  While they were well intentioned\r
+portability fixes, keeping things working with gcc-2.95 was also\r
+important.  Here is what I did to revert the change in the <em>master</em>\r
+branch and to adjust the <em>pu</em> branch, using core GIT tools and\r
+barebone Porcelain.</p>\r
+<p>First, prepare a throw-away branch in case I screw things up.</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git checkout -b revert-c99 master</tt></pre>\r
+</div></div>\r
+<p>Now I am on the <em>revert-c99</em> branch.  Let's figure out which commit to\r
+revert.  I happen to know that the top of the <em>master</em> branch is a\r
+merge, and its second parent (i.e. foreign commit I merged from) has\r
+the change I would want to undo.  Further I happen to know that that\r
+merge introduced 5 commits or so:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git show-branch --more=4 master master^2 | head\r
+* [master] Merge refs/heads/portable from http://www.cs.berkeley....\r
+ ! [master^2] Replace C99 array initializers with code.\r
+--\r
+-  [master] Merge refs/heads/portable from http://www.cs.berkeley....\r
+*+ [master^2] Replace C99 array initializers with code.\r
+*+ [master^2~1] Replace unsetenv() and setenv() with older putenv().\r
+*+ [master^2~2] Include sys/time.h in daemon.c.\r
+*+ [master^2~3] Fix ?: statements.\r
+*+ [master^2~4] Replace zero-length array decls with [].\r
+*  [master~1] tutorial note about git branch</tt></pre>\r
+</div></div>\r
+<p>The <em>&#8212;more=4</em> above means "after we reach the merge base of refs,\r
+show until we display four more common commits".  That last commit\r
+would have been where the "portable" branch was forked from the main\r
+git.git repository, so this would show everything on both branches\r
+since then.  I just limited the output to the first handful using\r
+<em>head</em>.</p>\r
+<p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of\r
+the <em>master</em>, and then go four generations back following the first\r
+parent") is the one I would want to revert.  Since I also want to say\r
+why I am reverting it, the <em>-n</em> flag is given to <em>git revert</em>.  This\r
+prevents it from actually making a commit, and instead <em>git revert</em>\r
+leaves the commit log message it wanted to use in <em>.msg</em> file:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git revert -n master^2~4\r
+$ cat .msg\r
+Revert "Replace zero-length array decls with []."\r
+\r
+This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit.\r
+$ git diff HEAD ;# to make sure what we are reverting makes sense.\r
+$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.\r
+$ make clean test ;# make sure it did not cause other breakage.</tt></pre>\r
+</div></div>\r
+<p>The reverted change makes sense (from reading the <em>diff</em> output), does\r
+fix the problem (from <em>make CC=gcc-2.95</em> test), and does not cause new\r
+breakage (from the last <em>make test</em>).  I'm ready to commit:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git commit -a -s ;# read .msg into the log,\r
+                    # and explain why I am reverting.</tt></pre>\r
+</div></div>\r
+<p>I could have screwed up in any of the above steps, but in the worst\r
+case I could just have done <em>git checkout master</em> to start over.\r
+Fortunately I did not have to; what I have in the current branch\r
+<em>revert-c99</em> is what I want.  So merge that back into <em>master</em>:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git checkout master\r
+$ git resolve master revert-c99 fast ;# this should be a fast forward\r
+Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...\r
+ cache.h        |    8 ++++----\r
+ commit.c       |    2 +-\r
+ ls-files.c     |    2 +-\r
+ receive-pack.c |    2 +-\r
+ server-info.c  |    2 +-\r
+ 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>\r
+</div></div>\r
+<p>The <em>fast</em> in the above <em>git resolve</em> is not a magic.  I knew this\r
+<em>resolve</em> would result in a fast forward merge, and if not, there is\r
+something very wrong (so I would do <em>git reset</em> on the <em>master</em> branch\r
+and examine the situation).  When a fast forward merge is done, the\r
+message parameter to <em>git resolve</em> is discarded, because no new commit\r
+is created.  You could have said <em>junk</em> or <em>nothing</em> there as well.</p>\r
+<p>There is no need to redo the test at this point.  We fast forwarded\r
+and we know <em>master</em> matches <em>revert-c99</em> exactly.  In fact:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git diff master..revert-c99</tt></pre>\r
+</div></div>\r
+<p>says nothing.</p>\r
+<p>Then we rebase the <em>pu</em> branch as usual.</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git checkout pu\r
+$ git tag pu-anchor pu\r
+$ git rebase master\r
+* Applying: Redo "revert" using three-way merge machinery.\r
+First trying simple merge strategy to cherry-pick.\r
+Finished one cherry-pick.\r
+* Applying: Remove git-apply-patch-script.\r
+First trying simple merge strategy to cherry-pick.\r
+Simple cherry-pick fails; trying Automatic cherry-pick.\r
+Removing Documentation/git-apply-patch-script.txt\r
+Removing git-apply-patch-script\r
+Finished one cherry-pick.\r
+* Applying: Document "git cherry-pick" and "git revert"\r
+First trying simple merge strategy to cherry-pick.\r
+Finished one cherry-pick.\r
+* Applying: mailinfo and applymbox updates\r
+First trying simple merge strategy to cherry-pick.\r
+Finished one cherry-pick.\r
+* Applying: Show commits in topo order and name all commits.\r
+First trying simple merge strategy to cherry-pick.\r
+Finished one cherry-pick.\r
+* Applying: More documentation updates.\r
+First trying simple merge strategy to cherry-pick.\r
+Finished one cherry-pick.</tt></pre>\r
+</div></div>\r
+<p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git\r
+rebase</em> screws up.  After this, I can do these for sanity check:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git diff pu-anchor..pu ;# make sure we got the master fix.\r
+$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.\r
+$ make clean test ;# make sure it did not cause other breakage.</tt></pre>\r
+</div></div>\r
+<p>Everything is in the good order.  I do not need the temporary branch\r
+nor tag anymore, so remove them:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ rm -f .git/refs/tags/pu-anchor\r
+$ git branch -d revert-c99</tt></pre>\r
+</div></div>\r
+<p>It was an emergency fix, so we might as well merge it into the\r
+<em>release candidate</em> branch, although I expect the next release would\r
+be some days off:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git checkout rc\r
+$ git pull . master\r
+Packing 0 objects\r
+Unpacking 0 objects\r
+\r
+* committish: e3a693c...        refs/heads/master from .\r
+Trying to merge e3a693c... into 8c1f5f0... using 10d781b...\r
+Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f\r
+ cache.h        |    8 ++++----\r
+ commit.c       |    2 +-\r
+ ls-files.c     |    2 +-\r
+ receive-pack.c |    2 +-\r
+ server-info.c  |    2 +-\r
+ 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>\r
+</div></div>\r
+<p>And the final repository status looks like this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git show-branch --more=1 master pu rc\r
+! [master] Revert "Replace zero-length array decls with []."\r
+ ! [pu] git-repack: Add option to repack all objects.\r
+  * [rc] Merge refs/heads/master from .\r
+---\r
+ +  [pu] git-repack: Add option to repack all objects.\r
+ +  [pu~1] More documentation updates.\r
+ +  [pu~2] Show commits in topo order and name all commits.\r
+ +  [pu~3] mailinfo and applymbox updates\r
+ +  [pu~4] Document "git cherry-pick" and "git revert"\r
+ +  [pu~5] Remove git-apply-patch-script.\r
+ +  [pu~6] Redo "revert" using three-way merge machinery.\r
+  - [rc] Merge refs/heads/master from .\r
+++* [master] Revert "Replace zero-length array decls with []."\r
+  - [rc~1] Merge refs/heads/master from .\r
+... [master~1] Merge refs/heads/portable from http://www.cs.berkeley....</tt></pre>\r
+</div></div>\r
+</div>\r
 </div>\r
-<p>caret=^\r
-startsb=&amp;#91;\r
-endsb=&amp;#93;</p>\r
-<p></p>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:33 UTC\r
+Last updated 03-Oct-2006 08:41:50 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/repository-layout.html b/repository-layout.html
index 3a571c8..9091806 100644 (file)
--- a/repository-layout.html
+++ b/repository-layout.html
@@ -523,7 +523,7 @@ logs/refs/tags/<tt>name</tt>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:30 UTC\r
+Last updated 03-Oct-2006 08:41:47 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial-2.html b/tutorial-2.html
index bab8ca4..c092d0e 100644 (file)
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -635,7 +635,7 @@ example, creating a new commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Sep-2006 07:38:12 UTC\r
+Last updated 03-Oct-2006 08:41:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial.html b/tutorial.html
index f8fa2f3..2095a28 100644 (file)
--- a/tutorial.html
+++ b/tutorial.html
@@ -701,7 +701,7 @@ digressions that may be interesting at this point are:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:25 UTC\r
+Last updated 03-Oct-2006 08:41:42 UTC\r
 </div>\r
 </div>\r
 </body>\r