diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-21 17:54:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-21 17:54:30 -0800 |
| commit | a75aada385d663fe4451d0f91aab3aa07c0d85e6 (patch) | |
| tree | 5ac7a0bf8355168914ff02768c14974e7fbff526 /git-merge.txt | |
| parent | 635978b311f6f7a8658016e600a28eb8740b062d (diff) | |
| download | git-htmldocs-a75aada385d663fe4451d0f91aab3aa07c0d85e6.tar.gz | |
Autogenerated HTML docs for v2.39.1-308-g56c8f
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 2d6a1391c..0aeff572a 100644 --- a/git-merge.txt +++ b/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 |