From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: git@vger.kernel.org
Subject: [minor BUG] cherry-pick -x doesn't work if a conflict occurs
Date: Wed, 29 Dec 2010 15:16:38 +0100 [thread overview]
Message-ID: <20101229141638.GA14865@pengutronix.de> (raw)
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.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next reply other threads:[~2010-12-29 14:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-29 14:16 Uwe Kleine-König [this message]
2011-01-05 6:31 ` [minor BUG] cherry-pick -x doesn't work if a conflict occurs Robin Rosenberg
2011-01-05 6:50 ` Uwe Kleine-König
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=20101229141638.GA14865@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--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).