{"thread":{"id":"66277","subject":"Typo in man page for git-merge","startedAt":"2026-09-05T16:29:41Z","lastAt":"2026-09-05T17:01:25Z","messageCount":2,"participants":["Fabian Kratz","Kristoffer Haugsbakk"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"552035","messageId":"T7GtKqbLStRVv4G9RYr5tCWEEkfQ5s-KzbS0OeeKfVArboamsIObGafTbl_XHsXRcCP3XjsR0xEqOsU3OzGVIurZWLGOnsUO9ZUn9UG0XHo=@proton.me","threadId":"66277","inReplyTo":null,"subject":"Typo in man page for git-merge","fromName":"Fabian Kratz","fromEmail":"fabian.kratz@proton.me","sentAt":"2026-09-05T16:29:34Z","receivedAt":"2026-09-05T16:29:41Z","isPatch":false,"body":"Hi, I just read the git man page git-merge and believe that I found a typo/error in an example. I don't know if this is the right place to post this, but this is the section:\n\n> Assume the following history exists and the current branch is \"master\":\n>\n>               A---B---C topic\n>              /\n>         D---E---F---G master\n>\n> Then \"git merge topic\" will replay the changes made on the topic branch since it diverged from master (i.e.,\n> E) until its current commit (C) on top of master, and record the result in a new commit along with the names\n> of the two parent commits and a log message from the user describing the changes. Before the operation,\n> ORIG_HEAD is set to the tip of the current branch (C).\n\nI believe ORIG_HEAD is actually set to G here, not C. My own experiments support this and it's what I would expect after reading the explanation."},{"id":"552038","messageId":"abd6ddbb-7981-4b1b-b050-73ced5b2960b@app.fastmail.com","threadId":"66277","inReplyTo":"T7GtKqbLStRVv4G9RYr5tCWEEkfQ5s-KzbS0OeeKfVArboamsIObGafTbl_XHsXRcCP3XjsR0xEqOsU3OzGVIurZWLGOnsUO9ZUn9UG0XHo=@proton.me","subject":"Re: Typo in man page for git-merge","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-09-05T17:00:47Z","receivedAt":"2026-09-05T17:01:25Z","isPatch":false,"body":"Hi Fabian\n\nOn Sat, Sep 5, 2026, at 18:29, Fabian Kratz wrote:\n> Hi, I just read the git man page git-merge and believe that I found a\n> typo/error in an example. I don't know if this is the right place to\n> post this, but this is the section:\n>\n>> Assume the following history exists and the current branch is \"master\":\n>>\n>>               A---B---C topic\n>>              /\n>>         D---E---F---G master\n>>\n>> Then \"git merge topic\" will replay the changes made on the topic branch since it diverged from master (i.e.,\n>> E) until its current commit (C) on top of master, and record the result in a new commit along with the names\n>> of the two parent commits and a log message from the user describing the changes. Before the operation,\n>> ORIG_HEAD is set to the tip of the current branch (C).\n>\n> I believe ORIG_HEAD is actually set to G here, not C. My own\n> experiments support this and it's what I would expect after reading the\n> explanation.\n\nThis was fixed in Git 2.51.0. Specifically in 953049ee (docs: correct\nORIG_HEAD example in \"git merge\" documentation, 2025-07-05).\n"}]}