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

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

From
Jeff King <peff@peff.net>
Date
Jul 26, 2013, 21:40 UTC
Message-ID
<20130726214036.GB1388@sigill.intra.peff.net>
In-Reply-To
<20130726213705.GJ14690@google.com>
On Fri, Jul 26, 2013 at 02:37:05PM -0700, Jonathan Nieder wrote:
Show 7 quoted lines
> Jeff King wrote:
> 
> > 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"?
Maybe. :)

I missed that subtlety. Of my "three things you would want to do", that means it was _trying_ say number 2, how to skip, rather than 3, how to abort. If that is the case, then it should probably explain the sequence of steps as "reset and then --continue" to make it more clear.

I.e., a patch is needed, but Ram's is going in the opposite direction.
-Peff
Previous: Jonathan NiederNext: Jeff King
Message 7 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.