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

I think there is error in merge documents - current branch

From
MSMinnie Shi <minnie.shi@gmail.com>
Date
May 20, 2023, 08:01 UTC
Message-ID
<CAOQx3AYx+sSD4REfTdQ0muY2zRgzE2nR7RgG7cxNgXvwzYzixg@mail.gmail.com>

Hi team, In there git merge document: https://git-scm.com/docs/git-merge

If you search the word “current”, you will see the paragraph describing a situation which changed the context. More specifically below the screenshot, the last one should be commit H instead of commit C , because the description talks about the `current branch is master`, and `git merge topic`` is being described.

in summary the sentence should be read as

Before the operation, ORIG_HEAD is set to the tip of the current branch (H). instead of Before the operation, ORIG_HEAD is set to the tip of the current branch (C).

Kind regards Min

Next: Kristoffer Haugsbakk
Message 1 of 9 in “I think there is error in merge documents - current branch”
  1. Minnie ShiMay 20, 2023
  2. doc: merge: fix mention of `ORIG_HEAD`Kristoffer Haugsbakk, May 20, 2023
  3. Minnie ShiMay 20, 2023
  4. Minnie ShiMay 20, 2023
  5. Junio C HamanoMay 20, 2023
  6. Kristoffer HaugsbakkMay 21, 2023
  7. Sergey OrganovMay 21, 2023
  8. Minnie ShiMay 21, 2023
  9. Minnie ShiMay 21, 2023

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.