Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Kristoffer Haugsbakk <>
Cc: Kristoffer Haugsbakk <>
Subject: [PATCH] doc: merge: fix mention of `ORIG_HEAD`
Date: Sat, 20 May 2023 10:44:39 +0200	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

`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 <>
Signed-off-by: Kristoffer Haugsbakk <>
 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

  reply	other threads:[~2023-05-20  8:45 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 ` Kristoffer Haugsbakk [this message]
2023-05-20  9:25   ` [PATCH] doc: merge: fix mention of `ORIG_HEAD` 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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).