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

--simplify-merges breakage

From
Kevin Bracey <kevin@bracey.fi>
Date
Apr 8, 2013, 19:00 UTC
Message-ID
<516313D3.2050309@bracey.fi>

Commit 4b7f53d ("simplify-merges: drop merge from irrelevant side branch") appears to have broken simplify-merges.

[Credit to "git bisect run" - and now I see the "report problems immediately" message on the recent merge of that change.]

I was trying to get my head around history simplification, by creating a repo with the example shown in the manual.The result of "gitk --simplify-merges foo" was far from pretty.

With the example in the manual, you should get this:
           .-A---M---N---O
          /     /       /
         I     B       D
          \   /       /
           `---------'
After 4b7f53 you instead get:
           .-A---M   N---O
         /     /   /   /
         I     B   /   D
          \   /   /   /
           `---------'
Kevin
Next: Junio C Hamano
Message 1 of 2 in “--simplify-merges breakage”
  1. Kevin BraceyApr 8, 2013
  2. Junio C HamanoApr 8, 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.