Skip to content

Commit 39a3682

Browse files
asheidukgitster
authored andcommitted
doc: fix ASCII art tab spacing
Followup to 5dd05eb ("doc: fix merge-base ASCII art tab spacing", 2016-10-21) Signed-off-by: Andreas Heiduk <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e44a44a commit 39a3682

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

Documentation/git-bisect-lk2009.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -633,11 +633,11 @@ and so at step 3) we compute f(X).
633633
Let's take the following graph as an example:
634634

635635
-------------
636-
G-H-I-J
637-
/ \
636+
G-H-I-J
637+
/ \
638638
A-B-C-D-E-F O
639-
\ /
640-
K-L-M-N
639+
\ /
640+
K-L-M-N
641641
-------------
642642

643643
If we compute the following non optimal function on it:
@@ -649,25 +649,25 @@ g(X) = min(number_of_ancestors(X), number_of_descendants(X))
649649
we get:
650650

651651
-------------
652-
4 3 2 1
653-
G-H-I-J
652+
4 3 2 1
653+
G-H-I-J
654654
1 2 3 4 5 6/ \0
655655
A-B-C-D-E-F O
656-
\ /
657-
K-L-M-N
658-
4 3 2 1
656+
\ /
657+
K-L-M-N
658+
4 3 2 1
659659
-------------
660660

661661
but with the algorithm used by git bisect we get:
662662

663663
-------------
664-
7 7 6 5
665-
G-H-I-J
664+
7 7 6 5
665+
G-H-I-J
666666
1 2 3 4 5 6/ \0
667667
A-B-C-D-E-F O
668-
\ /
669-
K-L-M-N
670-
7 7 6 5
668+
\ /
669+
K-L-M-N
670+
7 7 6 5
671671
-------------
672672

673673
So we chose G, H, K or L as the best bisection point, which is better
@@ -773,7 +773,7 @@ forked of the main branch at a commit named "D" like this:
773773
-------------
774774
A-B-C-D-E-F-G <--main
775775
\
776-
H-I-J <--dev
776+
H-I-J <--dev
777777
-------------
778778

779779
The commit "D" is called a "merge base" for branch "main" and "dev"

Documentation/git-checkout.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,9 @@ branch refers to a specific commit. Let's look at a repo with three
311311
commits, one of them tagged, and with branch 'master' checked out:
312312

313313
------------
314-
HEAD (refers to branch 'master')
315-
|
316-
v
314+
HEAD (refers to branch 'master')
315+
|
316+
v
317317
a---b---c branch 'master' (refers to commit 'c')
318318
^
319319
|
@@ -329,9 +329,9 @@ to commit 'd':
329329
------------
330330
$ edit; git add; git commit
331331

332-
HEAD (refers to branch 'master')
333-
|
334-
v
332+
HEAD (refers to branch 'master')
333+
|
334+
v
335335
a---b---c---d branch 'master' (refers to commit 'd')
336336
^
337337
|
@@ -398,7 +398,7 @@ at what happens when we then checkout master:
398398
------------
399399
$ git checkout master
400400

401-
HEAD (refers to branch 'master')
401+
HEAD (refers to branch 'master')
402402
e---f |
403403
/ v
404404
a---b---c---d branch 'master' (refers to commit 'd')

Documentation/git-merge-base.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch
154154
`origin/master` may have been rewound and rebuilt, leading to a
155155
history of this shape:
156156

157-
o---B2
157+
o---B2
158158
/
159159
---o---o---B1--o---o---o---B (origin/master)
160160
\
161-
B0
161+
B0
162162
\
163-
D0---D1---D (topic)
163+
D0---D1---D (topic)
164164

165165
where `origin/master` used to point at commits B0, B1, B2 and now it
166166
points at B, and your `topic` branch was started on top of it back

0 commit comments

Comments
 (0)