doc: fix ASCII art tab spacing
Followup to 5dd05ebf ("doc: fix merge-base ASCII art tab spacing", 2016-10-21) Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andreas Heiduk committed
Oct 22, 2018 at 22:45 UTC
39a36827ac4ee7d44a6bfb513faab453ba60ad3d
3 files changed
+25
-25
Documentation/git-bisect-lk2009.txt
+15
-15
@@ -633,11 +633,11 @@ and so at step 3) we compute f(X).
633
Let's take the following graph as an example:
634
635
-------------
636
- G-H-I-J
637
- / \
636
+ G-H-I-J
637
+ / \
638
A-B-C-D-E-F O
639
- \ /
640
- K-L-M-N
639
+ \ /
640
+ K-L-M-N
641
-------------
642
643
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))
649
we get:
650
651
-------------
652
- 4 3 2 1
653
- G-H-I-J
652
+ 4 3 2 1
653
+ G-H-I-J
654
1 2 3 4 5 6/ \0
655
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
659
-------------
660
661
but with the algorithm used by git bisect we get:
662
663
-------------
664
- 7 7 6 5
665
- G-H-I-J
664
+ 7 7 6 5
665
+ G-H-I-J
666
1 2 3 4 5 6/ \0
667
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
671
-------------
672
673
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:
773
-------------
774
A-B-C-D-E-F-G <--main
775
\
776
- H-I-J <--dev
776
+ H-I-J <--dev
777
-------------
778
779
The commit "D" is called a "merge base" for branch "main" and "dev"
Documentation/git-checkout.txt
+7
-7
@@ -311,9 +311,9 @@ branch refers to a specific commit. Let's look at a repo with three
311
commits, one of them tagged, and with branch 'master' checked out:
312
313
------------
314
- HEAD (refers to branch 'master')
315
- |
316
- v
314
+ HEAD (refers to branch 'master')
315
+ |
316
+ v
317
a---b---c branch 'master' (refers to commit 'c')
318
^
319
|
@@ -329,9 +329,9 @@ to commit 'd':
329
------------
330
$ edit; git add; git commit
331
332
- HEAD (refers to branch 'master')
333
- |
334
- v
332
+ HEAD (refers to branch 'master')
333
+ |
334
+ v
335
a---b---c---d branch 'master' (refers to commit 'd')
336
^
337
|
@@ -398,7 +398,7 @@ at what happens when we then checkout master:
398
------------
399
$ git checkout master
400
401
- HEAD (refers to branch 'master')
401
+ HEAD (refers to branch 'master')
402
e---f |
403
/ v
404
a---b---c---d branch 'master' (refers to commit 'd')
Documentation/git-merge-base.txt
+3
-3
@@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch
154
`origin/master` may have been rewound and rebuilt, leading to a
155
history of this shape:
156
157
- o---B2
157
+ o---B2
158
/
159
---o---o---B1--o---o---o---B (origin/master)
160
\
161
- B0
161
+ B0
162
\
163
- D0---D1---D (topic)
163
+ D0---D1---D (topic)
164
165
where `origin/master` used to point at commits B0, B1, B2 and now it
166
points at B, and your `topic` branch was started on top of it back