From: Sergey Organov Date: Wed, 14 Sep 2022 19:31:02 +0000 (+0300) Subject: diff-merges: clarify log.diffMerges documentation X-Git-Tag: v2.39.0-rc0~136^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c34a6bd291d5bfe2bec22d1c5441f8712306a527;p=thirdparty%2Fgit.git diff-merges: clarify log.diffMerges documentation Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index bc63bc3939..5f96cf87fb 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -34,9 +34,9 @@ log.excludeDecoration:: option. log.diffMerges:: - Set default diff format to be used for merge commits. See - `--diff-merges` in linkgit:git-log[1] for details. - Defaults to `separate`. + Set diff format to be used when `--diff-merges=on` is + specified, see `--diff-merges` in linkgit:git-log[1] for + details. Defaults to `separate`. log.follow:: If `true`, `git log` will act as if the `--follow` option was used when