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

Re: [PATCH] commit: correct advice about aborting a cherry-pick

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Jul 27, 2013, 08:19 UTC
Message-ID
<CALkWK0m7iypFRHaW-Wt4GQBGh0Kypss7FE8MxPGYU-sG86Dfsg@mail.gmail.com>
In-Reply-To
<20130726213705.GJ14690@google.com>
Jonathan Nieder wrote:
Show 5 quoted lines
>> Your patch is just swapping out "git reset" for "cherry-pick --abort",
>> so I think that is a good improvement in the meantime.
>
> Um, wasn't the idea of the original message that you can run "git
> reset" and then "git cherry-pick --continue"?

No, and I don't know where you got that idea. Certainly not by reading the history.

37f7a85 (Teach commit about CHERRY_PICK_HEAD, 2011-02-19) introduced that string. This happened before I introduced cherry-pick --continue in 5a5d80f (revert: Introduce --continue to continue the operation, 2011-08-04).

A proper solution to the problem would involve polishing sequencer.c, and probably getting --skip-empty so it behaves more like rebase. In case you missed it, one person already did that work and posted the code to the list [1].

[1]: http://article.gmane.org/gmane.comp.version-control.git/226982
Previous: Junio C Hamano
Message 18 of 18 in “commit: correct advice about aborting a cherry-pick”
  1. commit: correct advice about aborting a cherry-pickRamkumar Ramachandra, Jul 26, 2013
  2. Jeff KingJul 26, 2013
  3. Ramkumar RamachandraJul 26, 2013
  4. Jeff KingJul 26, 2013
  5. Ramkumar RamachandraJul 26, 2013
  6. Jonathan NiederJul 26, 2013
  7. Jeff KingJul 26, 2013
  8. Jeff KingJul 26, 2013
  9. Jeff KingJul 26, 2013
  10. Jonathan NiederJul 26, 2013
  11. Jeff KingJul 26, 2013
  12. Jeff KingJul 26, 2013
  13. Ramkumar RamachandraJul 27, 2013
  14. Junio C HamanoJul 29, 2013
  15. Jeff KingJul 29, 2013
  16. Junio C HamanoJul 29, 2013
  17. Junio C HamanoJul 29, 2013
  18. Ramkumar RamachandraJul 27, 2013

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.