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
Robin Rosenberg <robin.rosenberg@dewire.com>
Date
Jan 5, 2011, 06:31 UTC
Message-ID
<24C35180-AED6-4848-9F05-908831F911F9@dewire.com>
In-Reply-To
<20101229141638.GA14865@pengutronix.de>
29 dec 2010 kl. 15:16 skrev Uwe Kleine-König:
Show 9 quoted lines
> 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.

-- robin
Previous: Uwe Kleine-KönigNext: Uwe Kleine-König
Message 2 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.