From: Minnie Shi <minnie.shi@gmail.com>
To: git@vger.kernel.org
Subject: I think there is error in merge documents - current branch
Date: Sat, 20 May 2023 10:01:55 +0200 [thread overview]
Message-ID: <CAOQx3AYx+sSD4REfTdQ0muY2zRgzE2nR7RgG7cxNgXvwzYzixg@mail.gmail.com> (raw)
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 reply other threads:[~2023-05-20 8:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-20 8:01 Minnie Shi [this message]
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
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=CAOQx3AYx+sSD4REfTdQ0muY2zRgzE2nR7RgG7cxNgXvwzYzixg@mail.gmail.com \
--to=minnie.shi@gmail.com \
--cc=git@vger.kernel.org \
/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).