From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>, Git List <git@vger.kernel.org>
Subject: Re: git cherry-pick --continue?
Date: Thu, 11 Feb 2010 16:04:45 -0500 [thread overview]
Message-ID: <20100211210445.GA8819@coredump.intra.peff.net> (raw)
In-Reply-To: <7vpr4c200i.fsf@alter.siamese.dyndns.org>
On Wed, Feb 10, 2010 at 02:34:21PM -0800, Junio C Hamano wrote:
> Changing the insn to suggest using "-C topic" when the original command
> line was "git cherry-pick topic" would be a good addition, too. Currently
> we suggest "-c" and abbreviated object name, neither of which is sensible.
I think using the actual name instead of the abbreviated sha1 is
sensible. But I think "-c" makes sense, as it gives the user the chance
to look over the commit message to see if they need to tweak it to match
the conflict fixups. Savvy users who don't want to do that will know to
use "-C".
Series to follow:
[1/4]: cherry-pick: rewrap advice message
[2/4]: cherry-pick: refactor commit parsing code
[3/4]: cherry-pick: format help message as strbuf
[4/4]: cherry-pick: show commit name instead of sha1
-Peff
next prev parent reply other threads:[~2010-02-11 21:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-10 20:37 git cherry-pick --continue? Sverre Rabbelier
2010-02-10 21:04 ` Jeff King
2010-02-10 21:24 ` Jeff King
2010-02-10 21:26 ` Sverre Rabbelier
2010-02-10 22:01 ` Junio C Hamano
2010-02-10 22:21 ` Junio C Hamano
2010-02-10 22:23 ` Sverre Rabbelier
2010-02-10 22:34 ` Junio C Hamano
2010-02-10 22:38 ` Sverre Rabbelier
2010-02-11 21:04 ` Jeff King [this message]
2010-02-11 21:06 ` [PATCH 1/4] cherry-pick: rewrap advice message Jeff King
2010-02-11 21:06 ` [PATCH 2/4] cherry-pick: refactor commit parsing code Jeff King
2010-02-11 21:07 ` [PATCH 3/4] cherry-pick: format help message as strbuf Jeff King
2010-02-11 21:08 ` [PATCH 4/4] cherry-pick: show commit name instead of sha1 Jeff King
2010-02-11 21:19 ` git cherry-pick --continue? Jeff King
2010-02-11 23:05 ` Jay Soffian
2010-02-11 23:13 ` Junio C Hamano
2010-02-11 23:57 ` Jeff King
2010-02-11 19:32 ` Jeff King
2010-02-11 20:36 ` Junio C Hamano
2010-02-11 22:27 ` Jeff King
2010-02-12 14:11 ` 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=20100211210445.GA8819@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=srabbelier@gmail.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).