Skip to content

Commit 452d264

Browse files
Martin Ågrengitster
authored andcommitted
rev-list-options.txt: fix rendering of bonus paragraph
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 328c109 commit 452d264

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/rev-list-options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
129129
adjusting to updated upstream from time to time, and
130130
this option allows you to ignore the individual commits
131131
brought in to your history by such a merge.
132-
133132
ifdef::git-log[]
134-
This option also changes default diff format for merge commits
135-
to `first-parent`, see `--diff-merges=first-parent` for details.
133+
+
134+
This option also changes default diff format for merge commits
135+
to `first-parent`, see `--diff-merges=first-parent` for details.
136136
endif::git-log[]
137137

138138
--not::

0 commit comments

Comments
 (0)