mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 14:39:10 +02:00
Code

rev-list-options.txt: fix rendering of bonus paragraph

Browse Source 
In git-log(1) -- but not in git-shortlog(1) or git-rev-list(1) -- we
include a bonus paragraph in the description of `--first-parent`. But
we forgot to add a lone "+" for a list continuation, and we shouldn't
be indenting this second paragraph. As a result, we get a different
indentation and the `backticks` render literally.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Ågren 2021-02-17 20:56:04 +01:00 committed by Junio C Hamano
parent 328c109303
commit 452d26448d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/rev-list-options.txt
View File

@ -129,10 +129,10 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
adjusting to updated upstream from time to time, and
this option allows you to ignore the individual commits
brought in to your history by such a merge.
ifdef::git-log[]
This option also changes default diff format for merge commits
to `first-parent`, see `--diff-merges=first-parent` for details.
+
This option also changes default diff format for merge commits
to `first-parent`, see `--diff-merges=first-parent` for details.
endif::git-log[]
--not::