From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: git@vger.kernel.org
Subject: Re: [minor BUG] cherry-pick -x doesn't work if a conflict occurs
Date: Wed, 5 Jan 2011 07:50:47 +0100 [thread overview]
Message-ID: <20110105065047.GJ25121@pengutronix.de> (raw)
In-Reply-To: <24C35180-AED6-4848-9F05-908831F911F9@dewire.com>
On Wed, Jan 05, 2011 at 07:31:05AM +0100, Robin Rosenberg wrote:
>
> 29 dec 2010 kl. 15:16 skrev Uwe Kleine-König:
>
> > Hello,
> >
> > when hitting a conflict cherry-pick suggests using
> >
> > git commit -c $sha1
> >
> > but the resulting (suggested) commit log doesn't have the extra
> > reference requested by -x.
> >
>
> The man page says -x only takes effect when you do not have a conflict, so there
> is no bug.
ah, I wonder if this is intended or just documenting a short-coming :-)
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-01-05 6:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-29 14:16 [minor BUG] cherry-pick -x doesn't work if a conflict occurs Uwe Kleine-König
2011-01-05 6:31 ` Robin Rosenberg
2011-01-05 6:50 ` Uwe Kleine-König [this message]
2011-01-05 16:28 ` Jay Soffian
2011-01-05 16:37 ` Jay Soffian
2011-01-05 18:33 ` Junio C Hamano
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=20110105065047.GJ25121@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.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).