From: Martin Ågren Date: Sun, 17 May 2020 18:52:19 +0000 (+0200) Subject: git-commit-graph.txt: fix list rendering X-Git-Tag: v2.27.0-rc2~5^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce3614c32708a15006814a02136bf9ab5e62e487;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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