From: Junio C Hamano <gitster@pobox.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: Adam Monsen <haircut@gmail.com>, git@vger.kernel.org
Subject: Re: configuring cherry-pick to always use -x?
Date: Mon, 14 Feb 2011 13:23:11 -0800 [thread overview]
Message-ID: <AANLkTinpY2B0g-U4No-8rV7TFV5-z=x7AAGqgHNR7Wrt@mail.gmail.com> (raw)
In-Reply-To: <AANLkTin0xB=hJ-v21+esT6Zqj2f53XiwD8tBW4qFkuVy@mail.gmail.com>
On Mon, Feb 14, 2011 at 10:09 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> I've had it on my TODO list for a while now to:
> ...
> 2. improve the cherry-pick conflict UX. I was thinking of out
> CHERRY_HEAD on conflict and then adding a cherry-pick --continue
> option which acts like rebase --continue. CHERRY_HEAD is what was
> being picked at the time of conflict and can be used by the bash
> completion script for proper prompting, as well as obviously the
> --continue option.
Yes, we have so far only "use commit -c $that_one", which is an
obvious and low hanging fruit for improvement.
Thanks.
next prev parent reply other threads:[~2011-02-14 21:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 17:19 configuring cherry-pick to always use -x? Adam Monsen
2011-02-14 18:09 ` Jay Soffian
2011-02-14 21:23 ` Junio C Hamano [this message]
2011-02-14 21:05 ` Junio C Hamano
2011-02-14 21:50 ` Adam Monsen
2011-02-15 8:58 ` Michael J Gruber
2011-02-15 9:18 ` Jonathan Nieder
2011-02-15 9:29 ` Michael J Gruber
2011-02-15 16:16 ` Jay Soffian
2011-02-15 21:03 ` release maintenance vs. release engineering (was: configuring cherry-pick to always use -x?) Adam Monsen
2011-02-14 21:53 ` configuring cherry-pick to always use -x? Jay Soffian
2011-02-15 9:38 ` Ivan Kanis
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTinpY2B0g-U4No-8rV7TFV5-z=x7AAGqgHNR7Wrt@mail.gmail.com' \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=haircut@gmail.com \
--cc=jaysoffian@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).