{"thread":{"id":"26832","subject":"[PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'","startedAt":"2011-03-22T18:42:25Z","lastAt":"2011-03-22T20:00:57Z","messageCount":4,"participants":["SZEDER Gábor","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"164074","messageId":"1300819345-28279-1-git-send-email-szeder@ira.uka.de","threadId":"26832","inReplyTo":null,"subject":"[PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2011-03-22T18:42:25Z","receivedAt":"2011-03-22T18:42:25Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"'git am --abort' is around for quite a long time now, and users should\nnormally not poke around inside the .git directory, yet the\ndocumentation of 'git am' still recommends the following:\n\n  ... if you decide to start over from scratch,\n  run `rm -f -r .git/rebase-apply` ...\n\nSuggest 'git am --abort' instead.\n\nIt's not quite the same as the original, because 'git am --abort' will\nrestore the original branch, while simply removing '.git/rebase-apply'\nwon't, but that's rather a thinko in the original wording, because\nthat won't actually \"start over _from scratch_\".\n\nSigned-off-by: SZEDER Gábor <szeder@ira.uka.de>\n---\n Documentation/git-am.txt |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex 621b720..03fb214 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -173,9 +173,9 @@ aborts in the middle.  You can recover from this in one of two ways:\n   the index file to bring it into a state that the patch should\n   have produced.  Then run the command with the '--resolved' option.\n \n-The command refuses to process new mailboxes while the `.git/rebase-apply`\n-directory exists, so if you decide to start over from scratch,\n-run `rm -f -r .git/rebase-apply` before running the command with mailbox\n+The command refuses to process new mailboxes before the current\n+operation isn't finished, so if you decide to start over from scratch,\n+run `git am --abort` before running the command with mailbox\n names.\n \n Before any patches are applied, ORIG_HEAD is set to the tip of the\n-- \n1.7.4.1.372.g95585\n"},{"id":"164077","messageId":"7vy647j7gr.fsf@alter.siamese.dyndns.org","threadId":"26832","inReplyTo":"1300819345-28279-1-git-send-email-szeder@ira.uka.de","subject":"Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-22T19:11:48Z","receivedAt":"2011-03-22T19:11:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sensible; thanks.\n"},{"id":"164078","messageId":"20110322191708.GA23447@sigill.intra.peff.net","threadId":"26832","inReplyTo":"1300819345-28279-1-git-send-email-szeder@ira.uka.de","subject":"Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2011-03-22T19:17:08Z","receivedAt":"2011-03-22T19:17:08Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Mar 22, 2011 at 07:42:25PM +0100, SZEDER Gábor wrote:\n\n> -The command refuses to process new mailboxes while the `.git/rebase-apply`\n> -directory exists, so if you decide to start over from scratch,\n> -run `rm -f -r .git/rebase-apply` before running the command with mailbox\n> +The command refuses to process new mailboxes before the current\n> +operation isn't finished, so if you decide to start over from scratch,\n> +run `git am --abort` before running the command with mailbox\n>  names.\n\nGrammar: it should be \"...before the current operation is finished\".\n\n-Peff\n"},{"id":"164084","messageId":"20110322200056.GH14520@neumann","threadId":"26832","inReplyTo":"20110322191708.GA23447@sigill.intra.peff.net","subject":"Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2011-03-22T20:00:57Z","receivedAt":"2011-03-22T20:00:57Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"On Tue, Mar 22, 2011 at 03:17:08PM -0400, Jeff King wrote:\n> On Tue, Mar 22, 2011 at 07:42:25PM +0100, SZEDER Gábor wrote:\n> \n> > -The command refuses to process new mailboxes while the `.git/rebase-apply`\n> > -directory exists, so if you decide to start over from scratch,\n> > -run `rm -f -r .git/rebase-apply` before running the command with mailbox\n> > +The command refuses to process new mailboxes before the current\n> > +operation isn't finished, so if you decide to start over from scratch,\n> > +run `git am --abort` before running the command with mailbox\n> >  names.\n> \n> Grammar: it should be \"...before the current operation is finished\".\n\nThanks; I almost wrote after the '---' that I'm not quite happy with\nthe wording of the first part of the sentence, but I just couldn't see\nwhy...  at least now I know ;)\n\n\nBest,\nGábor\n"}]}