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

Re: RFD: best way to automatically rewrite a git DAG as a linear history?

From
Jon Seymour <jon.seymour@gmail.com>
Date
Feb 21, 2010, 23:18 UTC
Message-ID
<2cfc40321002211518u5eca5112wba42131341c3e286@mail.gmail.com>
In-Reply-To
<2cfc40321002211504o28069d16h4b9d1ef2230d03fe@mail.gmail.com>
Sorry, that lacked complete sense:

Thank you - FWIW, it is shaping up very well. In turns out that in cases where the original merge was resolved in favour of the _rebased branch_, the compensation can be squashed with the compensated commit - effectively bringing the eventual resolution of the conflict forward in time.

jon.
Previous: Jon Seymour
Message 11 of 11 in “RFD: best way to automatically rewrite a git DAG as a linear history?”
  1. Jon SeymourFeb 18, 2010
  2. Jeff KingFeb 18, 2010
  3. Avery PennarunFeb 18, 2010
  4. Jon SeymourFeb 19, 2010
  5. Avery PennarunFeb 19, 2010
  6. Jon SeymourFeb 19, 2010
  7. Avery PennarunFeb 19, 2010
  8. Jon SeymourFeb 20, 2010
  9. Avery PennarunFeb 20, 2010
  10. Jon SeymourFeb 21, 2010
  11. Jon SeymourFeb 21, 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.