diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:28 -0700 |
| commit | 8c5f7db806a9721112fd19596439469480ca94df (patch) | |
| tree | da94f3710fd1ebd48e843221ab915502031416b7 | |
| parent | 18cd7563d4ad77e6f77f156f80f4092eda4e2735 (diff) | |
| parent | 953049eed81b5da8602da97717fa225ab5bc1287 (diff) | |
| download | git-8c5f7db806a9721112fd19596439469480ca94df.tar.gz | |
Merge branch 'ts/merge-orig-head-doc-fix'
Doc fix.
* ts/merge-orig-head-doc-fix:
docs: correct ORIG_HEAD example in "git merge" documentation
| -rw-r--r-- | Documentation/git-merge.adoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc index d53923c3b7..a055384ad6 100644 --- a/Documentation/git-merge.adoc +++ b/Documentation/git-merge.adoc @@ -28,8 +28,8 @@ Assume the following history exists and the current branch is `master`: ------------ - A---B---C topic - / + A---B---C topic + / 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 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, -`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 ------------ |