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

Re: [PATCH v2] rebase -X: do not clobber strategy

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 12, 2010, 20:55 UTC
Message-ID
<7vaalefeio.fsf@alter.siamese.dyndns.org>
In-Reply-To
<AANLkTinrhfmeeToMZfW942xvJGz9vgiQd6+2bXkSawJU@mail.gmail.com>
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
Show 5 quoted lines
> That's clever. Thank you!
>
> The fix for this bug touches the same parts of the code as my
> refactoring of git rebase. If you don't mind, I will post your test
> case and the fix as part of the refactoring series.
Nah, I'd rather squash the test script into the fix.
Previous: Martin von Zweigbergk
Message 8 of 8 in “rebase -X: do not clobber strategy”
  1. rebase -X: do not clobber strategyMartin von Zweigbergk, Nov 10, 2010
  2. Sverre RabbelierNov 10, 2010
  3. Martin von ZweigbergkNov 11, 2010
  4. Thomas RastNov 11, 2010
  5. Martin von ZweigbergkNov 11, 2010
  6. Junio C HamanoNov 11, 2010
  7. Martin von ZweigbergkNov 12, 2010
  8. Junio C HamanoNov 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.