diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:47 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:47 +0900 |
| commit | 90d228b0d702d105dc2738f49528deb5fdb0e201 (patch) | |
| tree | 2db5de796cb521f76736ce5a736a1afcd33c2698 /Documentation/git-merge-base.txt | |
| parent | Merge branch 'ds/reachable' (diff) | |
| parent | doc: fix formatting in git-update-ref (diff) | |
| download | tgif-90d228b0d702d105dc2738f49528deb5fdb0e201.tar.xz | |
Merge branch 'ah/doc-updates'
Doc updates.
* ah/doc-updates:
doc: fix formatting in git-update-ref
doc: fix indentation of listing blocks in gitweb.conf.txt
doc: fix descripion for 'git tag --format'
doc: fix inappropriate monospace formatting
doc: fix ASCII art tab spacing
doc: clarify boundaries of 'git worktree list --porcelain'
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 |