From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Minnie Shi <minnie.shi@gmail.com>, git@vger.kernel.org
Subject: Re: I think there is error in merge documents - current branch
Date: Sun, 21 May 2023 15:23:23 +0300 [thread overview]
Message-ID: <87zg5xq3es.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqq353qk59y.fsf@gitster.g> (Junio C. Hamano's message of "Sun, 21 May 2023 07:27:21 +0900")
Junio C Hamano <gitster@pobox.com> writes:
> Minnie Shi <minnie.shi@gmail.com> writes:
>
>> 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).
>
> Not C but G (i.e. the tip _before_ the history is updated).
>
> I notice that we overuse "current" there. One is to refer to the
> most recent commit on a branch, the other is to refer to the branch
> that is checked out. For the former, we say "the tip" in the other
> sentence, and it probably will make it less ambiguous if used that
> phrase.
>
> Then "`git merge topic`" will replay the changes made on the
> `topic` branch since it diverged from `master` (i.e., `E`) until
> the commit at the tip of the `topic` (`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 (`G`).
>
> 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.
For me "apply changes" or even "apply cumulative changes" works much
better than "replay changes" in this context, especially provided we
will apparently have "git replay" soon.
Thanks,
-- Sergey Organov
next prev parent reply other threads:[~2023-05-21 12:23 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
2023-05-21 12:23 ` Sergey Organov [this message]
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=87zg5xq3es.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--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).