diff options
| author |   Martin Ågren <martin.agren@gmail.com> | 2021-02-17 20:56:04 +0100 |
|---|---|---|
| committer |   Junio C Hamano <gitster@pobox.com> | 2021-02-17 13:16:11 -0800 |
| commit | 452d26448d5469ac728570200936f08a0993a7bc (patch) | |
| tree | 751b128e263eca9979d27014f40918dd932e4ef5 | |
| parent | The eighth batch (diff) | |
| download | git-452d26448d5469ac728570200936f08a0993a7bc.tar.xz git-452d26448d5469ac728570200936f08a0993a7bc.zip | |
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 <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/rev-list-options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 96cc89d157d..2fa1629f1ea 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -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:: |