mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
doc: fix merge-base ASCII art tab spacing
The doc-tool stack does not always respect the 'tab = 8 spaces' rule, particularly the git-scm doc pages https://git-scm.com/docs/git-merge-base and the Git generated html pages. Use just spaces within the block of the ascii art. Noticed when reviewing Junio's suggested update to `git merge-base` https://public-inbox.org/git/xmqqmvi2sj8f.fsf@gitster.mtv.corp.google.com/T/#u Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0b65a8dbdb
commit
5dd05ebf6f
|
@ -80,8 +80,8 @@ which is reachable from both 'A' and 'B' through the parent relationship.
|
||||||
|
|
||||||
For example, with this topology:
|
For example, with this topology:
|
||||||
|
|
||||||
o---o---o---B
|
o---o---o---B
|
||||||
/
|
/
|
||||||
---o---1---o---o---o---A
|
---o---1---o---o---o---A
|
||||||
|
|
||||||
the merge base between 'A' and 'B' is '1'.
|
the merge base between 'A' and 'B' is '1'.
|
||||||
|
@ -116,11 +116,11 @@ the best common ancestor of all commits.
|
||||||
When the history involves criss-cross merges, there can be more than one
|
When the history involves criss-cross merges, there can be more than one
|
||||||
'best' common ancestor for two commits. For example, with this topology:
|
'best' common ancestor for two commits. For example, with this topology:
|
||||||
|
|
||||||
---1---o---A
|
---1---o---A
|
||||||
\ /
|
\ /
|
||||||
X
|
X
|
||||||
/ \
|
/ \
|
||||||
---2---o---o---B
|
---2---o---o---B
|
||||||
|
|
||||||
both '1' and '2' are merge-bases of A and B. Neither one is better than
|
both '1' and '2' are merge-bases of A and B. Neither one is better than
|
||||||
the other (both are 'best' merge bases). When the `--all` option is not given,
|
the other (both are 'best' merge bases). When the `--all` option is not given,
|
||||||
|
@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch
|
||||||
`origin/master` may have been rewound and rebuilt, leading to a
|
`origin/master` may have been rewound and rebuilt, leading to a
|
||||||
history of this shape:
|
history of this shape:
|
||||||
|
|
||||||
o---B1
|
o---B1
|
||||||
/
|
/
|
||||||
---o---o---B2--o---o---o---B (origin/master)
|
---o---o---B2--o---o---o---B (origin/master)
|
||||||
\
|
\
|
||||||
B3
|
B3
|
||||||
\
|
\
|
||||||
Derived (topic)
|
Derived (topic)
|
||||||
|
|
||||||
where `origin/master` used to point at commits B3, B2, B1 and now it
|
where `origin/master` used to point at commits B3, B2, B1 and now it
|
||||||
points at B, and your `topic` branch was started on top of it back
|
points at B, and your `topic` branch was started on top of it back
|
||||||
|
|
Loading…
Reference in a new issue