From: Jeff King <peff@peff.net>
Date: Tue, 22 Mar 2011 19:17:08 GMT
Subject: Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
Message-ID: <20110322191708.GA23447@sigill.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