undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: fix ASCII art tab spacing

Browse Source 
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>
This commit is contained in:
Andreas Heiduk 2018-10-22 22:45:42 +02:00 committed by Junio C Hamano
parent e44a44aa25
commit 39a36827ac
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Documentation/git-bisect-lk2009.txt
View File

@ -633,11 +633,11 @@ and so at step 3) we compute f(X).
Let's take the following graph as an example: Let's take the following graph as an example:
------------- -------------
G-H-I-J G-H-I-J
/ \ / \
A-B-C-D-E-F O A-B-C-D-E-F O
\ / \ /
K-L-M-N K-L-M-N
------------- -------------
If we compute the following non optimal function on it: 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))
we get: we get:
------------- -------------
4 3 2 1 4 3 2 1
G-H-I-J G-H-I-J
1 2 3 4 5 6/ \0 1 2 3 4 5 6/ \0
A-B-C-D-E-F O A-B-C-D-E-F O
\ / \ /
K-L-M-N K-L-M-N
4 3 2 1 4 3 2 1
------------- -------------
but with the algorithm used by git bisect we get: but with the algorithm used by git bisect we get:
------------- -------------
7 7 6 5 7 7 6 5
G-H-I-J G-H-I-J
1 2 3 4 5 6/ \0 1 2 3 4 5 6/ \0
A-B-C-D-E-F O A-B-C-D-E-F O
\ / \ /
K-L-M-N K-L-M-N
7 7 6 5 7 7 6 5
------------- -------------
So we chose G, H, K or L as the best bisection point, which is better 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:
------------- -------------
A-B-C-D-E-F-G <--main A-B-C-D-E-F-G <--main
\ \
H-I-J <--dev H-I-J <--dev
------------- -------------
The commit "D" is called a "merge base" for branch "main" and "dev" The commit "D" is called a "merge base" for branch "main" and "dev"

14
Documentation/git-checkout.txt
View File

@ -311,9 +311,9 @@ branch refers to a specific commit. Let's look at a repo with three
commits, one of them tagged, and with branch 'master' checked out: commits, one of them tagged, and with branch 'master' checked out:
------------ ------------
HEAD (refers to branch 'master') HEAD (refers to branch 'master')
| |
v v
a---b---c branch 'master' (refers to commit 'c') a---b---c branch 'master' (refers to commit 'c')
^ ^
| |
@ -329,9 +329,9 @@ to commit 'd':
------------ ------------
$ edit; git add; git commit $ edit; git add; git commit
HEAD (refers to branch 'master') HEAD (refers to branch 'master')
| |
v v
a---b---c---d branch 'master' (refers to commit 'd') a---b---c---d branch 'master' (refers to commit 'd')
^ ^
| |
@ -398,7 +398,7 @@ at what happens when we then checkout master:
------------ ------------
$ git checkout master $ git checkout master
HEAD (refers to branch 'master') HEAD (refers to branch 'master')
e---f | e---f |
/ v / v
a---b---c---d branch 'master' (refers to commit 'd') a---b---c---d branch 'master' (refers to commit 'd')

6
Documentation/git-merge-base.txt
View File

@ -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---B2 o---B2
/ /
---o---o---B1--o---o---o---B (origin/master) ---o---o---B1--o---o---o---B (origin/master)
\ \
B0 B0
\ \
D0---D1---D (topic) D0---D1---D (topic)
where `origin/master` used to point at commits B0, B1, B2 and now it where `origin/master` used to point at commits B0, B1, B2 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