From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
Date: Tue, 22 Mar 2011 15:17:08 -0400 [thread overview]
Message-ID: <20110322191708.GA23447@sigill.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2011-03-22 19:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-22 18:42 [PATCH] git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' SZEDER Gábor
2011-03-22 19:11 ` Junio C Hamano
2011-03-22 19:17 ` Jeff King [this message]
2011-03-22 20:00 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110322191708.GA23447@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder@ira.uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).