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 <levraiphilippeblain@gmail.com> Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philippe Blain committed
Jan 10, 2023 at 13:15 UTC
0c514d576685f72a42cf60a2690984fbc7f54a31
1 file changed
+2
-1
Documentation/git-merge.txt
+2
-1
@@ -37,7 +37,8 @@ Then "`git merge topic`" will replay the changes made on the
37
`topic` branch since it diverged from `master` (i.e., `E`) until
38
its current commit (`C`) on top of `master`, and record the result
39
in a new commit along with the names of the two parent commits and
40
-a log message from the user describing the changes.
40
+a log message from the user describing the changes. Before the operation,
41
+`ORIG_HEAD` is set to the tip of the current branch (`C`).
42
43
------------
44
A---B---C topic