From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jeff King <peff@peff.net>
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 21:00:57 +0100 [thread overview]
Message-ID: <20110322200056.GH14520@neumann> (raw)
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
prev parent reply other threads:[~2011-03-22 20:01 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
2011-03-22 20:00 ` SZEDER Gábor [this message]
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=20110322200056.GH14520@neumann \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.