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

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

From
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date
Dec 29, 2010, 14:16 UTC
Message-ID
<20101229141638.GA14865@pengutronix.de>
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: Robin Rosenberg
Message 1 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.