diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-26 03:43:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-26 03:43:30 +0300 |
| commit | 2638e33c825eb56260ad53be6b45bf31c1897ce9 (patch) | |
| tree | d45e541023aa571ccca2d33ea6cd9892a90c7709 /Documentation/rev-list-options.txt | |
| parent | 845d6030f81da3bb43bd24a78ef8c441a441c5d5 (diff) | |
| parent | f89f46b704c168657e80a8d4097aa7f858f58081 (diff) | |
Merge branch 'ma/doc-markup-fix'
Docfix.
* ma/doc-markup-fix:
gitmailmap.txt: fix rendering of e-mail addresses
git.txt: fix monospace rendering
rev-list-options.txt: fix rendering of bonus paragraph
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -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 1238bfd915..b1c8f86c6e 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:: |