From: "Kristoffer Haugsbakk" <code@khaugsbakk.name>
To: "Junio C Hamano" <gitster@pobox.com>,
"Minnie Shi" <minnie.shi@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: I think there is error in merge documents - current branch
Date: Sun, 21 May 2023 12:49:30 +0200 [thread overview]
Message-ID: <948e8a46-4257-45f6-8486-7cd1481779f2@app.fastmail.com> (raw)
In-Reply-To: <xmqq353qk59y.fsf@gitster.g>
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
next prev parent reply other threads:[~2023-05-21 11:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-20 8:01 I think there is error in merge documents - current branch Minnie Shi
2023-05-20 8:44 ` [PATCH] doc: merge: fix mention of `ORIG_HEAD` Kristoffer Haugsbakk
2023-05-20 9:25 ` Minnie Shi
2023-05-20 9:41 ` Minnie Shi
2023-05-20 22:27 ` I think there is error in merge documents - current branch Junio C Hamano
2023-05-21 10:49 ` Kristoffer Haugsbakk [this message]
2023-05-21 12:23 ` Sergey Organov
2023-05-21 13:28 ` Minnie Shi
2023-05-21 13:49 ` Minnie Shi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=948e8a46-4257-45f6-8486-7cd1481779f2@app.fastmail.com \
--to=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=minnie.shi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).