From: Jeff King <peff@peff.net>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] commit: correct advice about aborting a cherry-pick
Date: Fri, 26 Jul 2013 17:24:38 -0400 [thread overview]
Message-ID: <20130726212438.GA1388@sigill.intra.peff.net> (raw)
In-Reply-To: <CALkWK0=qYF=r+Ocb1Z1E=Oteau=AAXR7wnKakt-8Cejwz6Usrg@mail.gmail.com>
On Sat, Jul 27, 2013 at 02:47:47AM +0530, Ramkumar Ramachandra wrote:
> > 2. Skip this commit and continue the rest of the cherry-pick sequence.
>
> Nope, this is unsupported afaik.
Ah. I don't mind improving the message in the meantime, but it sounds
like this is a deficiency in sequenced cherry-pick that needs addressed
eventually.
Your patch is just swapping out "git reset" for "cherry-pick --abort",
so I think that is a good improvement in the meantime.
-Peff
next prev parent reply other threads:[~2013-07-26 21:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 18:12 [PATCH] commit: correct advice about aborting a cherry-pick Ramkumar Ramachandra
2013-07-26 19:16 ` Jeff King
2013-07-26 21:17 ` Ramkumar Ramachandra
2013-07-26 21:24 ` Jeff King [this message]
2013-07-26 21:27 ` Ramkumar Ramachandra
2013-07-26 21:37 ` Jonathan Nieder
2013-07-26 21:40 ` Jeff King
2013-07-26 22:43 ` Jeff King
2013-07-26 23:05 ` Jeff King
2013-07-26 23:08 ` Jonathan Nieder
2013-07-26 23:19 ` Jeff King
2013-07-26 23:39 ` Jeff King
2013-07-27 8:07 ` Ramkumar Ramachandra
2013-07-29 15:18 ` Junio C Hamano
2013-07-29 15:23 ` Jeff King
2013-07-29 15:48 ` Junio C Hamano
2013-07-29 15:15 ` Junio C Hamano
2013-07-27 8:19 ` Ramkumar Ramachandra
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=20130726212438.GA1388@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).