# [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' 4 messages from 2011-03-22 to 2011-03-22. Participants: SZEDER Gábor, Junio C Hamano, Jeff King. Thread: https://gitlist.dev/t/26832 ## SZEDER Gábor, 2011-03-22 18:42 Subject: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' Message-ID: <1300819345-28279-1-git-send-email-szeder@ira.uka.de> URL: https://gitlist.dev/e/1300819345-28279-1-git-send-email-szeder%40ira.uka.de ``` 'git am --abort' is around for quite a long time now, and users should normally not poke around inside the .git directory, yet the documentation of 'git am' still recommends the following: ... if you decide to start over from scratch, run `rm -f -r .git/rebase-apply` ... Suggest 'git am --abort' instead. It's not quite the same as the original, because 'git am --abort' will restore the original branch, while simply removing '.git/rebase-apply' won't, but that's rather a thinko in the original wording, because that won't actually "start over _from scratch_". Signed-off-by: SZEDER Gábor --- Documentation/git-am.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 621b720..03fb214 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -173,9 +173,9 @@ aborts in the middle. You can recover from this in one of two ways: 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 before the current +operation isn't 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 -- 1.7.4.1.372.g95585 ``` ## Junio C Hamano, 2011-03-22 19:11 Subject: Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' Message-ID: <7vy647j7gr.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vy647j7gr.fsf%40alter.siamese.dyndns.org In-Reply-To: <1300819345-28279-1-git-send-email-szeder@ira.uka.de> ``` Sensible; thanks. ``` ## Jeff King, 2011-03-22 19:17 Subject: Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' Message-ID: <20110322191708.GA23447@sigill.intra.peff.net> URL: https://gitlist.dev/e/20110322191708.GA23447%40sigill.intra.peff.net In-Reply-To: <1300819345-28279-1-git-send-email-szeder@ira.uka.de> ``` On Tue, Mar 22, 2011 at 07:42:25PM +0100, SZEDER Gábor wrote: > -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 before the current > +operation isn't finished, so if you decide to start over from scratch, > +run `git am --abort` before running the command with mailbox > names. Grammar: it should be "...before the current operation is finished". -Peff ``` ## SZEDER Gábor, 2011-03-22 20:00 Subject: Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' Message-ID: <20110322200056.GH14520@neumann> URL: https://gitlist.dev/e/20110322200056.GH14520%40neumann In-Reply-To: <20110322191708.GA23447@sigill.intra.peff.net> ``` On Tue, Mar 22, 2011 at 03:17:08PM -0400, Jeff King wrote: > On Tue, Mar 22, 2011 at 07:42:25PM +0100, SZEDER Gábor wrote: > > > -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 before the current > > +operation isn't finished, so if you decide to start over from scratch, > > +run `git am --abort` before running the command with mailbox > > names. > > Grammar: it should be "...before the current operation is finished". Thanks; I almost wrote after the '---' that I'm not quite happy with the wording of the first part of the sentence, but I just couldn't see why... at least now I know ;) Best, Gábor ```