diff options
| author | Timur Sultanaev <str.write@gmail.com> | 2025-07-05 17:39:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-07 08:52:58 -0700 |
| commit | 953049eed81b5da8602da97717fa225ab5bc1287 (patch) | |
| tree | 21cb8e2fe992b0544fdbc5edfc14af65f967b1b3 | |
| parent | Git 2.50 (diff) | |
| download | git-953049eed81b5da8602da97717fa225ab5bc1287.tar.gz git-953049eed81b5da8602da97717fa225ab5bc1287.zip | |
docs: correct ORIG_HEAD example in "git merge" documentation
Documentation for git-merge incorrectly notes that
tip of the current branch on ascii diagram is C,
while it is actually G (current branch is master,
HEAD on diagram is G).
Additionally diagrams on the page are adjusted
to use spaces instead of tabs, so that they align
regardless of tab size. This is in line with
diagrams on other git documentation pages.
Signed-off-by: Timur Sultanaev <str.write@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 12aa859d16..500120421c 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 ------------ |