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-merge-base.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-merge-base.txt')
| -rw-r--r-- | Documentation/git-merge-base.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index 502e00ec35..9f07f4f6ed 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape: - o---B2 + o---B2 / ---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 points at B, and your `topic` branch was started on top of it back |