From d97409fc4bcfdafd3ecae712910cd74ae8bf4d6e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 3 Oct 2006 08:41:56 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.2.3-g128e --- core-tutorial.html | 2 +- cvs-migration.html | 2 +- diffcore.html | 2 +- everyday.html | 2 +- git-add.html | 2 +- git-am.html | 2 +- git-annotate.html | 2 +- git-apply.html | 2 +- git-applymbox.html | 2 +- git-applypatch.html | 2 +- git-archimport.html | 2 +- git-archive.html | 2 +- git-bisect.html | 2 +- git-blame.html | 2 +- git-branch.html | 2 +- git-cat-file.html | 2 +- git-check-ref-format.html | 2 +- git-checkout-index.html | 2 +- git-checkout.html | 2 +- git-cherry-pick.html | 2 +- git-cherry.html | 2 +- git-clean.html | 2 +- git-clone.html | 2 +- git-commit-tree.html | 2 +- git-commit.html | 2 +- git-convert-objects.html | 2 +- git-count-objects.html | 2 +- git-cvsexportcommit.html | 2 +- git-cvsimport.html | 2 +- git-cvsserver.html | 2 +- git-daemon.html | 2 +- git-describe.html | 2 +- git-diff-files.html | 2 +- git-diff-index.html | 2 +- git-diff-stages.html | 2 +- git-diff-tree.html | 2 +- git-diff.html | 2 +- git-fetch-pack.html | 2 +- git-fetch.html | 2 +- git-fmt-merge-msg.html | 2 +- git-format-patch.html | 2 +- git-fsck-objects.html | 2 +- git-get-tar-commit-id.html | 2 +- git-grep.html | 2 +- git-hash-object.html | 2 +- git-http-fetch.html | 2 +- git-http-push.html | 2 +- git-imap-send.html | 2 +- git-index-pack.html | 2 +- git-init-db.html | 2 +- git-instaweb.html | 2 +- git-local-fetch.html | 2 +- git-log.html | 2 +- git-lost-found.html | 2 +- git-ls-files.html | 2 +- git-ls-remote.html | 2 +- git-ls-tree.html | 2 +- git-mailinfo.html | 2 +- git-mailsplit.html | 2 +- git-merge-base.html | 2 +- git-merge-index.html | 2 +- git-merge-one-file.html | 2 +- git-merge-tree.html | 2 +- git-merge.html | 2 +- git-mktag.html | 2 +- git-mktree.html | 2 +- git-mv.html | 2 +- git-name-rev.html | 2 +- git-p4import.html | 2 +- git-pack-objects.html | 2 +- git-pack-redundant.html | 2 +- git-parse-remote.html | 2 +- git-patch-id.html | 2 +- git-peek-remote.html | 2 +- git-prune-packed.html | 2 +- git-prune.html | 2 +- git-pull.html | 2 +- git-push.html | 2 +- git-quiltimport.html | 2 +- git-read-tree.html | 2 +- git-rebase.html | 2 +- git-receive-pack.html | 2 +- git-relink.html | 2 +- git-repack.html | 2 +- git-repo-config.html | 2 +- git-request-pull.html | 2 +- git-rerere.html | 2 +- git-reset.html | 2 +- git-resolve.html | 2 +- git-rev-list.html | 2 +- git-rev-parse.html | 4 +- git-rev-parse.txt | 2 +- git-revert.html | 2 +- git-rm.html | 2 +- git-send-email.html | 2 +- git-send-pack.html | 2 +- git-sh-setup.html | 2 +- git-shell.html | 2 +- git-shortlog.html | 2 +- git-show-branch.html | 2 +- git-show-index.html | 2 +- git-show.html | 2 +- git-ssh-fetch.html | 2 +- git-ssh-upload.html | 2 +- git-status.html | 2 +- git-stripspace.html | 2 +- git-svn.html | 2 +- git-svnimport.html | 2 +- git-symbolic-ref.html | 2 +- git-tag.html | 2 +- git-tar-tree.html | 2 +- git-tools.html | 2 +- git-unpack-file.html | 2 +- git-unpack-objects.html | 2 +- git-update-index.html | 2 +- git-update-ref.html | 2 +- git-update-server-info.html | 2 +- git-upload-archive.html | 2 +- git-upload-pack.html | 2 +- git-var.html | 2 +- git-verify-pack.html | 2 +- git-verify-tag.html | 2 +- git-whatchanged.html | 2 +- git-write-tree.html | 2 +- git.html | 2 +- gitk.html | 2 +- glossary.html | 2 +- hooks.html | 2 +- howto-index.html | 2 +- howto/revert-branch-rebase.html | 185 +++++++++++++++++++++++++++++++- repository-layout.html | 2 +- tutorial-2.html | 2 +- tutorial.html | 2 +- 133 files changed, 313 insertions(+), 138 deletions(-) diff --git a/core-tutorial.html b/core-tutorial.html index 7073b3ac6..88c3e5c7c 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -2011,7 +2011,7 @@ to follow, not easier.

diff --git a/cvs-migration.html b/cvs-migration.html index 6560db47a..fbcb5501e 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -579,7 +579,7 @@ that contain this changed "if" statement:

diff --git a/diffcore.html b/diffcore.html index 83eabfa2c..8914ec3a4 100644 --- a/diffcore.html +++ b/diffcore.html @@ -547,7 +547,7 @@ t diff --git a/everyday.html b/everyday.html index 8fc5856ba..90ed11a19 100644 --- a/everyday.html +++ b/everyday.html @@ -1067,7 +1067,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/git-add.html b/git-add.html index ccb3da127..54254fa19 100644 --- a/git-add.html +++ b/git-add.html @@ -388,7 +388,7 @@ git-add git-*.sh diff --git a/git-am.html b/git-am.html index fa00411a6..b26e4b4ea 100644 --- a/git-am.html +++ b/git-am.html @@ -418,7 +418,7 @@ names.

diff --git a/git-annotate.html b/git-annotate.html index e60bc8b6b..c3f27795f 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -338,7 +338,7 @@ which introduced the line. Optionally annotate from a given revision.

diff --git a/git-apply.html b/git-apply.html index 1fe07027b..18c90e94a 100644 --- a/git-apply.html +++ b/git-apply.html @@ -582,7 +582,7 @@ apply.whitespace diff --git a/git-applymbox.html b/git-applymbox.html index 7a7e6eb56..27d48b6a7 100644 --- a/git-applymbox.html +++ b/git-applymbox.html @@ -391,7 +391,7 @@ current branch.

diff --git a/git-applypatch.html b/git-applypatch.html index 7ca5ab382..54693ae27 100644 --- a/git-applypatch.html +++ b/git-applypatch.html @@ -329,7 +329,7 @@ information.

diff --git a/git-archimport.html b/git-archimport.html index b2af32587..887acd215 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -410,7 +410,7 @@ patches that have been traded out-of-sequence between the branches.

diff --git a/git-archive.html b/git-archive.html index 44215e7e2..8277f7f92 100644 --- 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 diff --git a/git-bisect.html b/git-bisect.html index 59912336c..9e74990cc 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -385,7 +385,7 @@ like this:

diff --git a/git-blame.html b/git-blame.html index f809e1a92..825997579 100644 --- a/git-blame.html +++ b/git-blame.html @@ -352,7 +352,7 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output diff --git a/git-branch.html b/git-branch.html index f6a7d515e..eb0169370 100644 --- a/git-branch.html +++ b/git-branch.html @@ -421,7 +421,7 @@ a branch and check it out with a single command.

diff --git a/git-cat-file.html b/git-cat-file.html index 1115c49ec..a7e9f78d2 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -364,7 +364,7 @@ be returned.

diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 46828d290..b180309ca 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -343,7 +343,7 @@ colon : is used as in srcref:dstref to mean "use srcref's diff --git a/git-checkout-index.html b/git-checkout-index.html index 1a74e01eb..822b0cf74 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -511,7 +511,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-checkout.html b/git-checkout.html index 255b2a5e3..34a981b2b 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -466,7 +466,7 @@ $ git update-index frotz diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 2278a6f01..f4fd6b218 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -346,7 +346,7 @@ effect to your working tree in a row.

diff --git a/git-cherry.html b/git-cherry.html index 65a327004..559f8c505 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -331,7 +331,7 @@ than pushing or pulling commits directly.

diff --git a/git-clean.html b/git-clean.html index 7fd8fa8e7..3a0ee3f18 100644 --- a/git-clean.html +++ b/git-clean.html @@ -344,7 +344,7 @@ affected are further limited to those that match them.

diff --git a/git-clone.html b/git-clone.html index 4d5f3d77d..ada479b1e 100644 --- a/git-clone.html +++ b/git-clone.html @@ -516,7 +516,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-commit-tree.html b/git-commit-tree.html index 73c14d3ca..cc4e1ee9d 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -403,7 +403,7 @@ Your sysadmin must hate you! diff --git a/git-commit.html b/git-commit.html index 4f3f54c73..8d8a94337 100644 --- a/git-commit.html +++ b/git-commit.html @@ -507,7 +507,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-convert-objects.html b/git-convert-objects.html index 6a389d885..cbd230744 100644 --- a/git-convert-objects.html +++ b/git-convert-objects.html @@ -292,7 +292,7 @@ git-convert-objects(1) Manual Page diff --git a/git-count-objects.html b/git-count-objects.html index 45f120afc..53928170c 100644 --- 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.

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index e23b12ecd..0447fa0f3 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -386,7 +386,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit diff --git a/git-cvsimport.html b/git-cvsimport.html index 6cb3f1792..182f6db7a 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -478,7 +478,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsserver.html b/git-cvsserver.html index 0c3ae29ce..ad90a7c74 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -442,7 +442,7 @@ No keyword expansion or newline munging is supported.

diff --git a/git-daemon.html b/git-daemon.html index 0002d8a2f..803be66f9 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -607,7 +607,7 @@ they correspond to these IP addresses.

diff --git a/git-describe.html b/git-describe.html index 24b6c848c..f745bacb3 100644 --- a/git-describe.html +++ b/git-describe.html @@ -367,7 +367,7 @@ butchered by Junio C Hamano <junkio@cox.net>

diff --git a/git-diff-files.html b/git-diff-files.html index b6dd84e11..1edeb7ad0 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -917,7 +917,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index b6b41ea06..386993878 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1007,7 +1007,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index cfc2d8c2e..9030aabc0 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -891,7 +891,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 7a36ad0ae..6dc78cd06 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1079,7 +1079,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index cad021c20..37b31bf0d 100644 --- a/git-diff.html +++ b/git-diff.html @@ -463,7 +463,7 @@ output diff in reverse. diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 38ab0ac7c..2543a7cad 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -368,7 +368,7 @@ have a common ancestor commit.

diff --git a/git-fetch.html b/git-fetch.html index bbfa2a7aa..bd635fd5f 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -607,7 +607,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 520e0bfbc..90b335ba5 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -300,7 +300,7 @@ automatically invoking git-merge.

diff --git a/git-format-patch.html b/git-format-patch.html index 5595286ba..5442377a8 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -450,7 +450,7 @@ git-format-patch -M -B origin diff --git a/git-fsck-objects.html b/git-fsck-objects.html index a053ed239..fe336df21 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -491,7 +491,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 7260a187c..4c79c32dc 100644 --- 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.

diff --git a/git-grep.html b/git-grep.html index b0829bb5a..7157465a1 100644 --- a/git-grep.html +++ b/git-grep.html @@ -483,7 +483,7 @@ revamped by Junio C Hamano.

diff --git a/git-hash-object.html b/git-hash-object.html index d0973ec2e..f3097ebaa 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -327,7 +327,7 @@ specified, it defaults to "blob".

diff --git a/git-http-fetch.html b/git-http-fetch.html index 0191d294c..39a2d246f 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -360,7 +360,7 @@ commit-id diff --git a/git-http-push.html b/git-http-push.html index 934c5ee6f..687e213fb 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -379,7 +379,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-imap-send.html b/git-imap-send.html index fcca345d0..2cf704a22 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -320,7 +320,7 @@ configuration file (shown with examples):

diff --git a/git-index-pack.html b/git-index-pack.html index 00ec6d910..aaff699b5 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -313,7 +313,7 @@ objects/pack/ directory of a git repository.

diff --git a/git-init-db.html b/git-init-db.html index e1d963a39..5c79f9d5e 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -389,7 +389,7 @@ add all existing file to the index diff --git a/git-instaweb.html b/git-instaweb.html index 475fd72b0..a8be79243 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -388,7 +388,7 @@ repository.

diff --git a/git-local-fetch.html b/git-local-fetch.html index 437fc3f3c..ed8a57a3b 100644 --- a/git-local-fetch.html +++ b/git-local-fetch.html @@ -351,7 +351,7 @@ git-local-fetch(1) Manual Page diff --git a/git-log.html b/git-log.html index e7ddc5bd8..11ff7c21b 100644 --- a/git-log.html +++ b/git-log.html @@ -384,7 +384,7 @@ git log -r --name-status release..test diff --git a/git-lost-found.html b/git-lost-found.html index 5dc8490d7..be9bdd11d 100644 --- a/git-lost-found.html +++ b/git-lost-found.html @@ -338,7 +338,7 @@ $ git rev-parse not-lost-anymore diff --git a/git-ls-files.html b/git-ls-files.html index 79d6adffb..c12f43f83 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -688,7 +688,7 @@ from getting ignored.

diff --git a/git-ls-remote.html b/git-ls-remote.html index 8cc179ff2..298c1723a 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 diff --git a/git-ls-tree.html b/git-ls-tree.html index 6c782fdfe..19ab13b18 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -397,7 +397,7 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-mailinfo.html b/git-mailinfo.html index 3099ef9d2..ec57b6d25 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -360,7 +360,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-mailsplit.html b/git-mailsplit.html index e89ea220d..3d9e56535 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -344,7 +344,7 @@ and Junio C Hamano <junkio@cox.net>

diff --git a/git-merge-base.html b/git-merge-base.html index cbcdf8afc..d2a1e64fe 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -312,7 +312,7 @@ relied on to decide in any particular way.

diff --git a/git-merge-index.html b/git-merge-index.html index e50a819c7..91fedf022 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz>

diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 40fd65880..4d41669d0 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -294,7 +294,7 @@ Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.

diff --git a/git-merge-tree.html b/git-merge-tree.html index 61b065ded..77c6b524d 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -300,7 +300,7 @@ entries that match <branch1> tree.

diff --git a/git-merge.html b/git-merge.html index 230111bd3..cb7d62aaa 100644 --- a/git-merge.html +++ b/git-merge.html @@ -567,7 +567,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-mktag.html b/git-mktag.html index 09ed2674a..be88ec400 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -309,7 +309,7 @@ size, you're doing something wrong)

diff --git a/git-mktree.html b/git-mktree.html index d5031a4bd..39fb3923a 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -307,7 +307,7 @@ built is written to the standard output.

diff --git a/git-mv.html b/git-mv.html index 90f771f15..ab549e8d5 100644 --- a/git-mv.html +++ b/git-mv.html @@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de> diff --git a/git-name-rev.html b/git-name-rev.html index 8dea9cac2..c42f5380b 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -342,7 +342,7 @@ not the context.

diff --git a/git-p4import.html b/git-p4import.html index a8374f2f3..99ab519c4 100644 --- a/git-p4import.html +++ b/git-p4import.html @@ -461,7 +461,7 @@ of mappings with each line containing one mapping in the format:

diff --git a/git-pack-objects.html b/git-pack-objects.html index b0d8a1611..96b86c95d 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -446,7 +446,7 @@ base-name diff --git a/git-pack-redundant.html b/git-pack-redundant.html index 03ae4e8bd..951c51df3 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -335,7 +335,7 @@ objects.

diff --git a/git-parse-remote.html b/git-parse-remote.html index cf9762200..dece80c36 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -324,7 +324,7 @@ get_remote_refs_for_push diff --git a/git-patch-id.html b/git-patch-id.html index 2a101f854..c80073f80 100644 --- 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.

diff --git a/git-peek-remote.html b/git-peek-remote.html index f01df0f40..d9ce63d32 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -333,7 +333,7 @@ stores them in the local repository under the same name.

diff --git a/git-prune-packed.html b/git-prune-packed.html index 787349128..82685e532 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -317,7 +317,7 @@ disk storage, etc.

diff --git a/git-prune.html b/git-prune.html index 4c26c8cb2..a10f50f80 100644 --- a/git-prune.html +++ b/git-prune.html @@ -340,7 +340,7 @@ borrows from your repository via its diff --git a/git-pull.html b/git-pull.html index af0c26086..cf2254fc1 100644 --- a/git-pull.html +++ b/git-pull.html @@ -809,7 +809,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-push.html b/git-push.html index 5c2e18287..38c815670 100644 --- a/git-push.html +++ b/git-push.html @@ -502,7 +502,7 @@ Pull: refs/heads/<head>:<remote> diff --git a/git-quiltimport.html b/git-quiltimport.html index 2435c6035..c41b50515 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -342,7 +342,7 @@ variable. diff --git a/git-read-tree.html b/git-read-tree.html index 047c5ef6a..bc765eade 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -662,7 +662,7 @@ have finished your work-in-progress), attempt the merge again.

diff --git a/git-rebase.html b/git-rebase.html index 997b2ff5a..94d7caf9a 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -508,7 +508,7 @@ a rebase. Upon completion, <branch> will be the current branch.

diff --git a/git-receive-pack.html b/git-receive-pack.html index 7953794c3..db2093766 100644 --- 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.

diff --git a/git-relink.html b/git-relink.html index 31c2000ce..133a736be 100644 --- 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.

diff --git a/git-repack.html b/git-repack.html index 1e760fa23..952693a92 100644 --- a/git-repack.html +++ b/git-repack.html @@ -381,7 +381,7 @@ engines, disk storage, etc.

diff --git a/git-repo-config.html b/git-repo-config.html index 0c7ae0eb5..98591805a 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -1036,7 +1036,7 @@ receive.denyNonFastforwads diff --git a/git-request-pull.html b/git-request-pull.html index 51290cbb6..46471fd6b 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -322,7 +322,7 @@ the given URL in the generated summary.

diff --git a/git-rerere.html b/git-rerere.html index 1ff5ab7e8..e311b6170 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -431,7 +431,7 @@ conflict.

diff --git a/git-reset.html b/git-reset.html index 51affa4f8..2fbdefa45 100644 --- 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 diff --git a/git-resolve.html b/git-resolve.html index 48ba329ab..7c89c0329 100644 --- a/git-resolve.html +++ b/git-resolve.html @@ -298,7 +298,7 @@ Dan Holmsand <holmsand@gmail.com>.

diff --git a/git-rev-list.html b/git-rev-list.html index c7304e87f..1bd3ba133 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -645,7 +645,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-parse.html b/git-rev-parse.html index 9577bdf30..c9005d772 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -514,7 +514,7 @@ A suffix ^ to a revision parameter means the first parent of

  • -A suffix ~<n> to a revision parameter means the commit +A suffix ~<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^^^ which is equivalent to rev^1^1^1. @@ -614,7 +614,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-rev-parse.txt b/git-rev-parse.txt index b761b4b96..2f1306c1d 100644 --- 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 '~' to a revision parameter means the commit +* A suffix '{tilde}' to a revision parameter means the commit object that is the 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 26bfd1737..3238f5498 100644 --- a/git-revert.html +++ b/git-revert.html @@ -343,7 +343,7 @@ effect to your working tree in a row.

    diff --git a/git-rm.html b/git-rm.html index 57be79f65..0c00258a5 100644 --- a/git-rm.html +++ b/git-rm.html @@ -399,7 +399,7 @@ git-rm -f git-*.sh diff --git a/git-send-email.html b/git-send-email.html index 623451f7e..0a35b9193 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -430,7 +430,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

    diff --git a/git-send-pack.html b/git-send-pack.html index 35145429b..9b2e2cc5a 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -410,7 +410,7 @@ to disable the fast-forward check only on that ref.

    diff --git a/git-sh-setup.html b/git-sh-setup.html index fe778c843..701a4f165 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -299,7 +299,7 @@ use it as follows:

    diff --git a/git-shell.html b/git-shell.html index 8db19d58c..d15c8497e 100644 --- a/git-shell.html +++ b/git-shell.html @@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.

    diff --git a/git-shortlog.html b/git-shortlog.html index f504f2bce..ba0748bd6 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -317,7 +317,7 @@ Eve Jones <eve@laptop.(none)> diff --git a/git-show-branch.html b/git-show-branch.html index afd0867f6..631912bc5 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -480,7 +480,7 @@ your topic branch, it is shown as well.

    diff --git a/git-show-index.html b/git-show-index.html index 9490c714f..fbd573b36 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -296,7 +296,7 @@ offset and SHA1 of each object.

    diff --git a/git-show.html b/git-show.html index 7dc1d20f8..025f692b6 100644 --- a/git-show.html +++ b/git-show.html @@ -322,7 +322,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-ssh-fetch.html b/git-ssh-fetch.html index 86971160a..bce84327b 100644 --- a/git-ssh-fetch.html +++ b/git-ssh-fetch.html @@ -349,7 +349,7 @@ commit-id diff --git a/git-ssh-upload.html b/git-ssh-upload.html index b7ff3c48e..12e6ca555 100644 --- a/git-ssh-upload.html +++ b/git-ssh-upload.html @@ -348,7 +348,7 @@ commit-id diff --git a/git-status.html b/git-status.html index 4794a1a3e..11e19fbfe 100644 --- a/git-status.html +++ b/git-status.html @@ -309,7 +309,7 @@ Junio C Hamano <junkio@cox.net>.

    diff --git a/git-stripspace.html b/git-stripspace.html index 37a2c33cf..a808582e1 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -305,7 +305,7 @@ git-stripspace(1) Manual Page diff --git a/git-svn.html b/git-svn.html index fd03854e5..cda5b2dda 100644 --- a/git-svn.html +++ b/git-svn.html @@ -729,7 +729,7 @@ detect them.

    diff --git a/git-svnimport.html b/git-svnimport.html index f55b6f031..5d815adf3 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -512,7 +512,7 @@ various participants of the git-list <git@vger.kernel.org>.

    diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 6983e5fe8..2b13baede 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -314,7 +314,7 @@ changed at compilation time.

    diff --git a/git-tag.html b/git-tag.html index 83bcf629a..fe9fa9769 100644 --- a/git-tag.html +++ b/git-tag.html @@ -371,7 +371,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.< diff --git a/git-tar-tree.html b/git-tar-tree.html index 6b32fcd46..dd4e569ee 100644 --- 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 diff --git a/git-tools.html b/git-tools.html index bcdaf173c..0fa4ac575 100644 --- a/git-tools.html +++ b/git-tools.html @@ -407,7 +407,7 @@ tweaking to work on XEmacs. diff --git a/git-unpack-file.html b/git-unpack-file.html index 3b3784aea..aab08f0dd 100644 --- 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: diff --git a/git-unpack-objects.html b/git-unpack-objects.html index 881d3c5b1..be16f009f 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -333,7 +333,7 @@ new packs and replace existing ones.

    diff --git a/git-update-index.html b/git-update-index.html index 37ab2ff0f..ba8b41a25 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -714,7 +714,7 @@ need to use git-update-index --chmod=.

    diff --git a/git-update-ref.html b/git-update-ref.html index 64e59f5fb..c60eb855f 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -354,7 +354,7 @@ or does not have committer information available.

    diff --git a/git-update-server-info.html b/git-update-server-info.html index f8747fdbd..bc77efb94 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -332,7 +332,7 @@ info/refs file unless --force flag is given.

    diff --git a/git-upload-archive.html b/git-upload-archive.html index d30c68a5e..c9ce0871b 100644 --- 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.

    diff --git a/git-upload-pack.html b/git-upload-pack.html index f9b2cadad..43def6041 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -310,7 +310,7 @@ repository. For push operations, see git-send-pack.

    diff --git a/git-var.html b/git-var.html index bfc251abb..895b6cecd 100644 --- a/git-var.html +++ b/git-var.html @@ -372,7 +372,7 @@ Your sysadmin must hate you! diff --git a/git-verify-pack.html b/git-verify-pack.html index 6df8ea7e7..aa0988c3d 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -338,7 +338,7 @@ corresponding pack file.

    diff --git a/git-verify-tag.html b/git-verify-tag.html index 8256fecab..be9c5207f 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page diff --git a/git-whatchanged.html b/git-whatchanged.html index bb14e756c..9f106ef3c 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -384,7 +384,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-write-tree.html b/git-write-tree.html index 81ee88947..b09ce6420 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -323,7 +323,7 @@ now, you need to have done a git-update-index phase before you did the diff --git a/git.html b/git.html index 7cded856a..0cfc4fda5 100644 --- a/git.html +++ b/git.html @@ -2172,7 +2172,7 @@ contributors on the git-list <git@vger.kernel.org>.

    diff --git a/gitk.html b/gitk.html index 2b32c8c50..e835d27bb 100644 --- a/gitk.html +++ b/gitk.html @@ -423,7 +423,7 @@ gitk --max-count=100 --all — Makefile diff --git a/glossary.html b/glossary.html index a62b4e2b7..dcdcdb228 100644 --- a/glossary.html +++ b/glossary.html @@ -950,7 +950,7 @@ the git-list <git@vger.kernel.org>.

    diff --git a/hooks.html b/hooks.html index 0bd6d2f8e..24656155a 100644 --- a/hooks.html +++ b/hooks.html @@ -406,7 +406,7 @@ you can redirect your output to your stderr.

    diff --git a/howto-index.html b/howto-index.html index 3ec1989eb..5b4f07252 100644 --- a/howto-index.html +++ b/howto-index.html @@ -365,7 +365,7 @@ as a Linux subsystem maintainer.

    diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 6a33c6a2e..ae699d601 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -255,17 +255,192 @@ div.exampleblock-content { padding-left: 0.5em; } +Reverting an existing commit +
    +
    +

    One of the changes I pulled into the master branch turns out to +break building GIT with GCC 2.95. While they were well intentioned +portability fixes, keeping things working with gcc-2.95 was also +important. Here is what I did to revert the change in the master +branch and to adjust the pu branch, using core GIT tools and +barebone Porcelain.

    +

    First, prepare a throw-away branch in case I screw things up.

    +
    +
    +
    $ git checkout -b revert-c99 master
    +
    +

    Now I am on the revert-c99 branch. Let's figure out which commit to +revert. I happen to know that the top of the master branch is a +merge, and its second parent (i.e. foreign commit I merged from) has +the change I would want to undo. Further I happen to know that that +merge introduced 5 commits or so:

    +
    +
    +
    $ git show-branch --more=4 master master^2 | head
+* [master] Merge refs/heads/portable from http://www.cs.berkeley....
+ ! [master^2] Replace C99 array initializers with code.
+--
+-  [master] Merge refs/heads/portable from http://www.cs.berkeley....
+*+ [master^2] Replace C99 array initializers with code.
+*+ [master^2~1] Replace unsetenv() and setenv() with older putenv().
+*+ [master^2~2] Include sys/time.h in daemon.c.
+*+ [master^2~3] Fix ?: statements.
+*+ [master^2~4] Replace zero-length array decls with [].
+*  [master~1] tutorial note about git branch
    +
    +

    The —more=4 above means "after we reach the merge base of refs, +show until we display four more common commits". That last commit +would have been where the "portable" branch was forked from the main +git.git repository, so this would show everything on both branches +since then. I just limited the output to the first handful using +head.

    +

    Now I know master^2~4 (pronounce it as "find the second parent of +the master, and then go four generations back following the first +parent") is the one I would want to revert. Since I also want to say +why I am reverting it, the -n flag is given to git revert. This +prevents it from actually making a commit, and instead git revert +leaves the commit log message it wanted to use in .msg file:

    +
    +
    +
    $ git revert -n master^2~4
+$ cat .msg
+Revert "Replace zero-length array decls with []."
+
+This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit.
+$ git diff HEAD ;# to make sure what we are reverting makes sense.
+$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
+$ make clean test ;# make sure it did not cause other breakage.
    +
    +

    The reverted change makes sense (from reading the diff output), does +fix the problem (from make CC=gcc-2.95 test), and does not cause new +breakage (from the last make test). I'm ready to commit:

    +
    +
    +
    $ git commit -a -s ;# read .msg into the log,
+                    # and explain why I am reverting.
    +
    +

    I could have screwed up in any of the above steps, but in the worst +case I could just have done git checkout master to start over. +Fortunately I did not have to; what I have in the current branch +revert-c99 is what I want. So merge that back into master:

    +
    +
    +
    $ git checkout master
+$ git resolve master revert-c99 fast ;# this should be a fast forward
+Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
+ cache.h        |    8 ++++----
+ commit.c       |    2 +-
+ ls-files.c     |    2 +-
+ receive-pack.c |    2 +-
+ server-info.c  |    2 +-
+ 5 files changed, 8 insertions(+), 8 deletions(-)
    +
    +

    The fast in the above git resolve is not a magic. I knew this +resolve would result in a fast forward merge, and if not, there is +something very wrong (so I would do git reset on the master branch +and examine the situation). When a fast forward merge is done, the +message parameter to git resolve is discarded, because no new commit +is created. You could have said junk or nothing there as well.

    +

    There is no need to redo the test at this point. We fast forwarded +and we know master matches revert-c99 exactly. In fact:

    +
    +
    +
    $ git diff master..revert-c99
    +
    +

    says nothing.

    +

    Then we rebase the pu branch as usual.

    +
    +
    +
    $ git checkout pu
+$ git tag pu-anchor pu
+$ git rebase master
+* Applying: Redo "revert" using three-way merge machinery.
+First trying simple merge strategy to cherry-pick.
+Finished one cherry-pick.
+* Applying: Remove git-apply-patch-script.
+First trying simple merge strategy to cherry-pick.
+Simple cherry-pick fails; trying Automatic cherry-pick.
+Removing Documentation/git-apply-patch-script.txt
+Removing git-apply-patch-script
+Finished one cherry-pick.
+* Applying: Document "git cherry-pick" and "git revert"
+First trying simple merge strategy to cherry-pick.
+Finished one cherry-pick.
+* Applying: mailinfo and applymbox updates
+First trying simple merge strategy to cherry-pick.
+Finished one cherry-pick.
+* Applying: Show commits in topo order and name all commits.
+First trying simple merge strategy to cherry-pick.
+Finished one cherry-pick.
+* Applying: More documentation updates.
+First trying simple merge strategy to cherry-pick.
+Finished one cherry-pick.
    +
    +

    The temporary tag pu-anchor is me just being careful, in case git +rebase screws up. After this, I can do these for sanity check:

    +
    +
    +
    $ git diff pu-anchor..pu ;# make sure we got the master fix.
+$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
+$ make clean test ;# make sure it did not cause other breakage.
    +
    +

    Everything is in the good order. I do not need the temporary branch +nor tag anymore, so remove them:

    +
    +
    +
    $ rm -f .git/refs/tags/pu-anchor
+$ git branch -d revert-c99
    +
    +

    It was an emergency fix, so we might as well merge it into the +release candidate branch, although I expect the next release would +be some days off:

    +
    +
    +
    $ git checkout rc
+$ git pull . master
+Packing 0 objects
+Unpacking 0 objects
+
+* committish: e3a693c...        refs/heads/master from .
+Trying to merge e3a693c... into 8c1f5f0... using 10d781b...
+Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
+ cache.h        |    8 ++++----
+ commit.c       |    2 +-
+ ls-files.c     |    2 +-
+ receive-pack.c |    2 +-
+ server-info.c  |    2 +-
+ 5 files changed, 8 insertions(+), 8 deletions(-)
    +
    +

    And the final repository status looks like this:

    +
    +
    +
    $ git show-branch --more=1 master pu rc
+! [master] Revert "Replace zero-length array decls with []."
+ ! [pu] git-repack: Add option to repack all objects.
+  * [rc] Merge refs/heads/master from .
+---
+ +  [pu] git-repack: Add option to repack all objects.
+ +  [pu~1] More documentation updates.
+ +  [pu~2] Show commits in topo order and name all commits.
+ +  [pu~3] mailinfo and applymbox updates
+ +  [pu~4] Document "git cherry-pick" and "git revert"
+ +  [pu~5] Remove git-apply-patch-script.
+ +  [pu~6] Redo "revert" using three-way merge machinery.
+  - [rc] Merge refs/heads/master from .
+++* [master] Revert "Replace zero-length array decls with []."
+  - [rc~1] Merge refs/heads/master from .
+... [master~1] Merge refs/heads/portable from http://www.cs.berkeley....
    +
    +
    -

    caret=^ -startsb=&#91; -endsb=&#93;

    -

    diff --git a/repository-layout.html b/repository-layout.html index 3a571c8df..90918067e 100644 --- a/repository-layout.html +++ b/repository-layout.html @@ -523,7 +523,7 @@ logs/refs/tags/name diff --git a/tutorial-2.html b/tutorial-2.html index bab8ca41a..c092d0eb9 100644 --- a/tutorial-2.html +++ b/tutorial-2.html @@ -635,7 +635,7 @@ example, creating a new commit.

    diff --git a/tutorial.html b/tutorial.html index f8fa2f39a..2095a2842 100644 --- a/tutorial.html +++ b/tutorial.html @@ -701,7 +701,7 @@ digressions that may be interesting at this point are:

    -- 2.26.2