freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Timur Sultanaev and committed by
Junio C Hamano 953049ee 16bd9f20

+5 -5
unified split
+5 -5
Documentation/git-merge.adoc
··· 28 28 `master`: 29 29 30 30 ------------ 31 - A---B---C topic 32 - / 31 + A---B---C topic 32 + / 33 33 D---E---F---G master 34 34 ------------ 35 35 ··· 38 38 its current commit (`C`) on top of `master`, and record the result 39 39 in a new commit along with the names of the two parent commits and 40 40 a log message from the user describing the changes. Before the operation, 41 - `ORIG_HEAD` is set to the tip of the current branch (`C`). 41 + `ORIG_HEAD` is set to the tip of the current branch (`G`). 42 42 43 43 ------------ 44 - A---B---C topic 45 - / \ 44 + A---B---C topic 45 + / \ 46 46 D---E---F---G---H master 47 47 ------------ 48 48