diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2020-05-17 20:52:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-18 13:19:23 -0700 |
| commit | ce3614c32708a15006814a02136bf9ab5e62e487 (patch) | |
| tree | f85a3f15dc775f69364a600b900fff42b04d3561 /Documentation/git-commit-graph.txt | |
| parent | 1aa7b686d65f53b8abfc5b22c9f23e68ed732e07 (diff) | |
| download | git-ce3614c32708a15006814a02136bf9ab5e62e487.tar.gz | |
git-commit-graph.txt: fix list rendering
The first list item follows immediately on the paragraph where we
introduce the list. This makes the "*" render literally as part of one
huge paragraph. (With AsciiDoc, everything is fine after that, but with
Asciidoctor, we get some minor follow-on errors.) Add an empty line --
with a list continuation ("+") -- to make the first list item render ok.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit-graph.txt')
| -rw-r--r-- | Documentation/git-commit-graph.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt index 258bf66e46..a3d996787b 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.txt @@ -68,6 +68,7 @@ chain of multiple commit-graph files stored in strategy and other splitting options. The new commits not already in the commit-graph are added in a new "tip" file. This file is merged with the existing file if the following merge conditions are met: ++ * If `--split=no-merge` is specified, a merge is never performed, and the remaining options are ignored. `--split=replace` overwrites the existing chain with a new one. A bare `--split` defers to the remaining |