diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2023-01-10 13:15:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-13 17:55:46 (GMT) |
| commit | 0c514d576685f72a42cf60a2690984fbc7f54a31 (patch) | |
| tree | 3e74bd261ae68b526a353133da134ec00c5ba0e3 /Documentation/git-merge.txt | |
| parent | d03c773cf6c9d425a8d25af7a45775e280fd6d81 (diff) | |
| download | git-0c514d576685f72a42cf60a2690984fbc7f54a31.zip git-0c514d576685f72a42cf60a2690984fbc7f54a31.tar.gz git-0c514d576685f72a42cf60a2690984fbc7f54a31.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 2d6a139..0aeff57 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 |