X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=Documentation%2Frev-list-options.txt;fp=Documentation%2Frev-list-options.txt;h=b1c8f86c6efc128514533ef21b3e0272b8680838;hp=1238bfd915d23144ad60260609780f138f80785c;hb=2638e33c825eb56260ad53be6b45bf31c1897ce9;hpb=845d6030f81da3bb43bd24a78ef8c441a441c5d5 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::