From: Junio C Hamano Date: Tue, 22 Mar 2011 21:56:13 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.7.5-rc0~47 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1ea9f9d6c28caf886747ca256e9d39d24f03d229?ds=inline;hp=-c Merge branch 'maint' * maint: git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' bisect: visualize with git-log if gitk is unavailable --- 1ea9f9d6c28caf886747ca256e9d39d24f03d229 diff --combined Documentation/git-am.txt index 621b720091,4d37de639d..6b1b5af64e --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@@ -173,9 -173,9 +173,9 @@@ aborts in the middle. You can recover the index file to bring it into a state that the patch should have produced. Then run the command with the '--resolved' option. - The command refuses to process new mailboxes while the `.git/rebase-apply` - directory exists, so if you decide to start over from scratch, - run `rm -f -r .git/rebase-apply` before running the command with mailbox + The command refuses to process new mailboxes until the current + operation is finished, so if you decide to start over from scratch, + run `git am --abort` before running the command with mailbox names. Before any patches are applied, ORIG_HEAD is set to the tip of the @@@ -189,6 -189,15 +189,6 @@@ SEE ALS -------- linkgit:git-apply[1]. - -Author ------- -Written by Junio C Hamano - -Documentation --------------- -Documentation by Petr Baudis, Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite