global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ts/merge-orig-head-doc-fix'

Browse Source 
Doc fix.

* ts/merge-orig-head-doc-fix:
  docs: correct ORIG_HEAD example in "git merge" documentation
This commit is contained in:
Junio C Hamano
2025-07-14 11:19:27 -07:00
parent 18cd7563d4 953049eed8
commit 8c5f7db806
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-merge.adoc
View File

@@ -28,8 +28,8 @@ Assume the following history exists and the current branch is
`master`: `master`:
------------ ------------
A---B---C topic A---B---C topic
/ /
D---E---F---G master D---E---F---G master
------------ ------------
@@ -38,11 +38,11 @@ Then `git merge topic` will replay the changes made on the
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. Before the operation, a log message from the user describing the changes. Before the operation,
`ORIG_HEAD` is set to the tip of the current branch (`C`). `ORIG_HEAD` is set to the tip of the current branch (`G`).
------------ ------------
A---B---C topic A---B---C topic
/ \ / \
D---E---F---G---H master D---E---F---G---H master
------------ ------------