From: Philippe Blain Date: Tue, 10 Jan 2023 13:15:19 +0000 (+0000) Subject: git-merge.txt: mention 'ORIG_HEAD' in the Description X-Git-Tag: v2.40.0-rc0~73^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c514d576685f72a42cf60a2690984fbc7f54a31;p=thirdparty%2Fgit.git git-merge.txt: mention 'ORIG_HEAD' in the Description The fact that 'git merge' writes 'ORIG_HEAD' before performing the merge is missing from the documentation of the command. Mention it in the 'Description' section. Signed-off-by: Philippe Blain Acked-by: Phillip Wood Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 2d6a1391c8..0aeff572a5 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -37,7 +37,8 @@ Then "`git merge topic`" will replay the changes made on the `topic` branch since it diverged from `master` (i.e., `E`) until 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. +a log message from the user describing the changes. Before the operation, +`ORIG_HEAD` is set to the tip of the current branch (`C`). ------------ A---B---C topic