| Message ID | c6337eba029bd5a53f76433c51bbe86c82faf507.1684571874.git.code@khaugsbakk.name (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | doc: merge: fix mention of `ORIG_HEAD` | expand |
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: > > `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 >
Okay, i read one more time, i think it should be read as Before the operation, -`ORIG_HEAD` is set to the tip of the "current" branch (`G`) instead of Before the operation, -`ORIG_HEAD` is set to the tip of the "current" branch (`C`) On Sat, May 20, 2023 at 11:25 AM Minnie Shi <minnie.shi@gmail.com> wrote: > > 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: > > > > `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
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
`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(-)