git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [minor BUG] cherry-pick -x doesn't work if a conflict occurs

From
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date
Jan 5, 2011, 06:50 UTC
Message-ID
<20110105065047.GJ25121@pengutronix.de>
In-Reply-To
<24C35180-AED6-4848-9F05-908831F911F9@dewire.com>
On Wed, Jan 05, 2011 at 07:31:05AM +0100, Robin Rosenberg wrote:
Show 15 quoted lines
> 
> 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/  |
Previous: Robin RosenbergNext: Jay Soffian
Message 3 of 6 in “[minor BUG] cherry-pick -x doesn't work if a conflict occurs”
  1. Uwe Kleine-KönigDec 29, 2010
  2. Robin RosenbergJan 5, 2011
  3. Uwe Kleine-KönigJan 5, 2011
  4. Jay SoffianJan 5, 2011
  5. Jay SoffianJan 5, 2011
  6. Junio C HamanoJan 5, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.