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

Re: I think there is error in merge documents - current branch

From
Kristoffer Haugsbakk <code@khaugsbakk.name>
Date
May 21, 2023, 10:49 UTC
Message-ID
<948e8a46-4257-45f6-8486-7cd1481779f2@app.fastmail.com>
In-Reply-To
<xmqq353qk59y.fsf@gitster.g>
On Sun, May 21, 2023, at 00:27, Junio C Hamano wrote:
Show 5 quoted lines
> My reading also hiccupped with "replay"; the first sentence to
> explain the command says "incorporate the changes", and that may be
> a less confusing expression; "replay" somehow makes me imagine that
> the changes are cherry-picked one by one---it may be only me, so I
> left it as-is in the suggestion above.

Yeah, it made me think of cherry-picks, essentially (specifically a rebase). “Replaying” doesn’t seem relevant in this context, but that’s just based on my layman conceptualization of how git-merge works.

“will replay the changes made on the” comes from b40bb374a61 (Documentation: merge: add an overview, 2010-01-23), which expanded the first paragraph of Description and added the two examples.

-- 
Kristoffer Haugsbakk
Previous: Junio C HamanoNext: Sergey Organov
Message 6 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.