mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge.txt: mention 'ORIG_HEAD' in the Description

Browse Source 
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>
This commit is contained in:
Philippe Blain
2023-01-10 13:15:19 +00:00
committed by Junio C Hamano
parent d03c773cf6
commit 0c514d5766
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-merge.txt
View File

@ -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 `topic` branch since it diverged from `master` (i.e., `E`) until
its current commit (`C`) on top of `master`, and record the result 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 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 A---B---C topic