From: Sverre Rabbelier <srabbelier@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>
Subject: Re: git cherry-pick --continue?
Date: Wed, 10 Feb 2010 23:23:29 +0100 [thread overview]
Message-ID: <fabb9a1e1002101423y79460afdn2bc31b117195ef42@mail.gmail.com> (raw)
In-Reply-To: <7vbpfw3f6t.fsf@alter.siamese.dyndns.org>
Heya,
On Wed, Feb 10, 2010 at 23:21, Junio C Hamano <gitster@pobox.com> wrote:
> Having said all I did in the previous message, I think "am --continue"
> would be a good addition.
How about 'cherry-pick --resolved' though ;).
> And "rebase --resolved" would not make any sense if the reason the control
> is given back to you was because you ran "rebase -i" and marked a commit
> to be "edit"ed. Of course, we could add "--resolved" and "--edited" (or
> perhaps "--amended") to "rebase", and have it make sure that the correct
> one is given. For example, when it stopped for "edit", it would reject
> "rebase --resolved". But I do not think it is worth the hassle.
I don't see any benefit to that, in fact, I'd recommend against it.
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2010-02-10 22:23 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 [this message]
2010-02-10 22:34 ` Junio C Hamano
2010-02-10 22:38 ` Sverre Rabbelier
2010-02-11 21:04 ` Jeff King
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=fabb9a1e1002101423y79460afdn2bc31b117195ef42@mail.gmail.com \
--to=srabbelier@gmail.com \
--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 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).