From: Sergey Organov Date: Mon, 21 Dec 2020 15:19:58 +0000 (+0300) Subject: doc/rev-list-options: document --first-parent changes merges format X-Git-Tag: v2.31.0-rc0~84^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e58142add40e0db354eaed9554d1b0c871e23f7d;p=thirdparty%2Fgit.git doc/rev-list-options: document --first-parent changes merges format After introduction of the --diff-merges=first-parent, the --first-parent sets the default format for merges to the same value as this new option. Document this behavior and add corresponding reference to --diff-merges. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 002379056a..96cc89d157 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -130,6 +130,11 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). 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. +endif::git-log[] + --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) for all following revision specifiers, up to the next `--not`.