Re: [PATCH] doc: merge: fix mention of `ORIG_HEAD`

From: Minnie Shi <minnie.shi@gmail.com>
Date: May 20, 2023, 09:25 UTC
Message-ID: <CAOQx3Aa9_cW-s6YoeYLac0j8VuhJ8cvEdGieS-+K-gD7D7TBRQ@mail.gmail.com>
In-Reply-To: <c6337eba029bd5a53f76433c51bbe86c82faf507.1684571874.git.code@khaugsbakk.name>

The document says the “current” branch is master , which means the HEAD is (G), which does not matter, it is not what I am challenging.

What I am challenging is that it continues the context and says:

Before the operation, -`ORIG_HEAD` is set to the tip of the "current" branch (`C`).

that is not true, current branch is master, and it is (G), Maybe it should be changed to "topic branch", so it reads like this:

Before the operation, -`ORIG_HEAD` is set to the tip of the ”topic” branch (`C`).

Min

On Sat, May 20, 2023 at 10:45 AM Kristoffer Haugsbakk <code@khaugsbakk.name> wrote:

Show 27 quoted lines

>
> `ORIG_HEAD` before the attempted merge points at the commit that you are
> on (the tip of `master`), not the tip of the branch that you are trying
> to merge in.
>
> Reported-by: Minnie Shi <minnie.shi@gmail.com>
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
> ---
>  Documentation/git-merge.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index 0aeff572a59..9019b6a1e50 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -38,7 +38,7 @@ Then "`git merge topic`" will replay the changes made on the
>  its current commit (`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 (`C`).
> +`ORIG_HEAD` is set to the tip of the current branch (`G`).
>
>  ------------
>           A---B---C topic
> --
> 2.41.0.rc1
>

-- 
Kind regards
Min