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

Re: git cherry-pick --continue?

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Feb 10, 2010, 22:23 UTC
Message-ID
<fabb9a1e1002101423y79460afdn2bc31b117195ef42@mail.gmail.com>
In-Reply-To
<7vbpfw3f6t.fsf@alter.siamese.dyndns.org>
Heya,
On Wed, Feb 10, 2010 at 23:21, Junio C Hamano <gitster@pobox.com> wrote:
> Having said all I did in the previous message, I think "am --continue"
> would be a good addition.
How about 'cherry-pick --resolved' though ;).
Show 6 quoted lines
> And "rebase --resolved" would not make any sense if the reason the control
> is given back to you was because you ran "rebase -i" and marked a commit
> to be "edit"ed.  Of course, we could add "--resolved" and "--edited" (or
> perhaps "--amended") to "rebase", and have it make sure that the correct
> one is given.  For example, when it stopped for "edit", it would reject
> "rebase --resolved".  But I do not think it is worth the hassle.
I don't see any benefit to that, in fact, I'd recommend against it.
-- 
Cheers,

Sverre Rabbelier
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 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.