Skip to content

Commit 0c514d5

Browse files
phil-blaingitster
authored andcommitted
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 <[email protected]> Acked-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d03c773 commit 0c514d5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/git-merge.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Then "`git merge topic`" will replay the changes made on the
3737
`topic` branch since it diverged from `master` (i.e., `E`) until
3838
its current commit (`C`) on top of `master`, and record the result
3939
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`).
4142

4243
------------
4344
A---B---C topic

0 commit comments

Comments
 (0)