git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sverre Rabbelier <srabbelier@gmail.com>
To: Git List <git@vger.kernel.org>
Subject: git cherry-pick --continue?
Date: Wed, 10 Feb 2010 21:37:10 +0100	[thread overview]
Message-ID: <fabb9a1e1002101237i60a0b2c5j6d1e52b33dacbaa2@mail.gmail.com> (raw)

Heya,

At the moment git cherry-pick stands out from the sequencer tools in
that it doesn't support --continue but requires you to manually supply
the '-c ...' argument to 'git commit' when there's a conflict instead.
Is it desirable that we add such an option? And if so, how would one
go about implementing it?

-- 
Cheers,

Sverre Rabbelier

             reply	other threads:[~2010-02-10 20:37 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-10 20:37 Sverre Rabbelier [this message]
2010-02-10 21:04 ` git cherry-pick --continue? 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
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=fabb9a1e1002101237i60a0b2c5j6d1e52b33dacbaa2@mail.gmail.com \
    --to=srabbelier@gmail.com \
    --cc=git@vger.kernel.org \
    /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).