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

Re: [PATCH v2] Make cherry-pick use rerere for conflict resolution.

From
AMAbhijit Menon-Sen <ams@toroid.org>
Date
Aug 12, 2008, 02:34 UTC
Message-ID
<20080812023411.GA14831@toroid.org>
In-Reply-To
<7vmyjjxuca.fsf@gitster.siamese.dyndns.org>
At 2008-08-11 11:47:01 -0700, gitster@pobox.com wrote:
>
> I do not think that story is a good example.
I agree, it's a stretch.

I can't think of any better rationale for the change than "It might conceivably be convenient to someone at some point", which falls a fair bit short of being convincing.

To be honest, it took so little time to implement this suggestion that I didn't realise until later that there was no realistic use-case and nothing to say about the patch.

Sorry for the noise.
-- ams
Previous: Junio C HamanoNext: Junio C Hamano
Message 11 of 12 in “Make cherry-pick use rerere for conflict resolution.”
  1. Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen, Aug 10, 2008
  2. Johannes SchindelinAug 10, 2008
  3. Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen, Aug 11, 2008
  4. Johannes SchindelinAug 11, 2008
  5. Petr BaudisAug 11, 2008
  6. Johannes SchindelinAug 11, 2008
  7. Johannes SixtAug 11, 2008
  8. Johannes SchindelinAug 11, 2008
  9. Johannes SixtAug 12, 2008
  10. Junio C HamanoAug 11, 2008
  11. Abhijit Menon-SenAug 12, 2008
  12. Junio C HamanoAug 12, 2008

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.