git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'

From
SZEDER Gábor <szeder@ira.uka.de>
Date
Mar 22, 2011, 20:00 UTC
Message-ID
<20110322200056.GH14520@neumann>
In-Reply-To
<20110322191708.GA23447@sigill.intra.peff.net>
On Tue, Mar 22, 2011 at 03:17:08PM -0400, Jeff King wrote:
Show 11 quoted lines
> 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

Previous: Jeff King
Message 4 of 4 in “git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'”
  1. git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'SZEDER Gábor, Mar 22, 2011
  2. Junio C HamanoMar 22, 2011
  3. Jeff KingMar 22, 2011
  4. SZEDER GáborMar 22, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.