diff options
| author | Andreas Heiduk <asheiduk@gmail.com> | 2018-10-22 22:45:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-23 12:23:09 +0900 |
| commit | 39a36827ac4ee7d44a6bfb513faab453ba60ad3d (patch) | |
| tree | 967e51c153c7ce6352111c1699891d3e4348c394 /Documentation/git-bisect-lk2009.txt | |
| parent | e44a44aa25c5ff22334efe0bd4187b96303b00fd (diff) | |
| download | git-39a36827ac4ee7d44a6bfb513faab453ba60ad3d.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-bisect-lk2009.txt')
| -rw-r--r-- | Documentation/git-bisect-lk2009.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt index 0f9ef2f25e..e99925184d 100644 --- a/Documentation/git-bisect-lk2009.txt +++ b/Documentation/git-bisect-lk2009.txt @@ -633,11 +633,11 @@ and so at step 3) we compute f(X). Let's take the following graph as an example: ------------- - G-H-I-J - / \ + G-H-I-J + / \ 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: @@ -649,25 +649,25 @@ g(X) = min(number_of_ancestors(X), number_of_descendants(X)) we get: ------------- - 4 3 2 1 - G-H-I-J + 4 3 2 1 + G-H-I-J 1 2 3 4 5 6/ \0 A-B-C-D-E-F O - \ / - K-L-M-N - 4 3 2 1 + \ / + K-L-M-N + 4 3 2 1 ------------- but with the algorithm used by git bisect we get: ------------- - 7 7 6 5 - G-H-I-J + 7 7 6 5 + G-H-I-J 1 2 3 4 5 6/ \0 A-B-C-D-E-F O - \ / - K-L-M-N - 7 7 6 5 + \ / + K-L-M-N + 7 7 6 5 ------------- 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 \ - H-I-J <--dev + H-I-J <--dev ------------- The commit "D" is called a "merge base" for branch "main" and "dev" |