[PATCH] doc: merge: fix mention of `ORIG_HEAD`
From: Kristoffer Haugsbakk <hidden>
Date: 2023-05-20 08:45:21
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
`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 <redacted> Signed-off-by: Kristoffer Haugsbakk <redacted> --- 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