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

Re: git cherry-pick --continue?

From
Jeff King <peff@peff.net>
Date
Feb 11, 2010, 21:04 UTC
Message-ID
<20100211210445.GA8819@coredump.intra.peff.net>
In-Reply-To
<7vpr4c200i.fsf@alter.siamese.dyndns.org>
On Wed, Feb 10, 2010 at 02:34:21PM -0800, Junio C Hamano wrote:
> Changing the insn to suggest using "-C topic" when the original command
> line was "git cherry-pick topic" would be a good addition, too.  Currently
> we suggest "-c" and abbreviated object name, neither of which is sensible.

I think using the actual name instead of the abbreviated sha1 is sensible. But I think "-c" makes sense, as it gives the user the chance to look over the commit message to see if they need to tweak it to match the conflict fixups. Savvy users who don't want to do that will know to use "-C".

Series to follow:
  [1/4]: cherry-pick: rewrap advice message
  [2/4]: cherry-pick: refactor commit parsing code
  [3/4]: cherry-pick: format help message as strbuf
  [4/4]: cherry-pick: show commit name instead of sha1
-Peff
Previous: Sverre RabbelierNext: Jeff King
Message 10 of 22 in “git cherry-pick --continue?”
  1. Sverre RabbelierFeb 10, 2010
  2. Jeff KingFeb 10, 2010
  3. Jeff KingFeb 10, 2010
  4. Sverre RabbelierFeb 10, 2010
  5. Junio C HamanoFeb 10, 2010
  6. Junio C HamanoFeb 10, 2010
  7. Sverre RabbelierFeb 10, 2010
  8. Junio C HamanoFeb 10, 2010
  9. Sverre RabbelierFeb 10, 2010
  10. Jeff KingFeb 11, 2010
  11. 1/4 cherry-pick: rewrap advice messageJeff King, Feb 11, 2010
  12. 2/4 cherry-pick: refactor commit parsing codeJeff King, Feb 11, 2010
  13. 3/4 cherry-pick: format help message as strbufJeff King, Feb 11, 2010
  14. 4/4 cherry-pick: show commit name instead of sha1Jeff King, Feb 11, 2010
  15. Jeff KingFeb 11, 2010
  16. Jay SoffianFeb 11, 2010
  17. Junio C HamanoFeb 11, 2010
  18. Jeff KingFeb 11, 2010
  19. Jeff KingFeb 11, 2010
  20. Junio C HamanoFeb 11, 2010
  21. Jeff KingFeb 11, 2010
  22. SZEDER GáborFeb 12, 2010

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.