Thread (2 messages) 2 messages, 2 authors, 2023-05-21

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

From: Kristoffer Haugsbakk <hidden>
Date: 2023-05-21 11:05:24

On Sun, May 21, 2023, at 00:27, Junio C Hamano wrote:
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help