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

Typo in man page for git-merge

From
FKFabian Kratz <fabian.kratz@proton.me>
Date
Sep 5, 2026, 16:29 UTC
Message-ID
<T7GtKqbLStRVv4G9RYr5tCWEEkfQ5s-KzbS0OeeKfVArboamsIObGafTbl_XHsXRcCP3XjsR0xEqOsU3OzGVIurZWLGOnsUO9ZUn9UG0XHo=@proton.me>
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:
Show 10 quoted lines
> Assume the following history exists and the current branch is "master":
>
>               A---B---C topic
>              /
>         D---E---F---G master
>
> Then "git merge topic" will replay the changes made on the topic branch since it diverged from master (i.e.,
> E) until its current commit (C) on top of master, and record the result in a new commit along with the names
> of the two parent commits and a log message from the user describing the changes. Before the operation,
> ORIG_HEAD is set to the tip of the current branch (C).
I 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.
Next: Kristoffer Haugsbakk
Message 1 of 2 in “Typo in man page for git-merge”
  1. Fabian KratzSep 5, 2026
  2. Kristoffer HaugsbakkSep 5, 2026

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.