From: Štěpán Němec Date: Thu, 5 Oct 2023 09:00:52 +0000 (+0200) Subject: doc/diff-options: improve wording of the log.diffMerges mention X-Git-Tag: v2.43.0-rc0~17^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043465a6cf251202171b70b304b02dc306eff5f8;p=thirdparty%2Fgit.git doc/diff-options: improve wording of the log.diffMerges mention Fix the grammar ("which default value is") and reword to match other similar descriptions (say "configuration variable" instead of "parameter", link to git-config(1)). Signed-off-by: Štěpán Němec Signed-off-by: Junio C Hamano --- diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index ee256ec077..48a5012748 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -53,9 +53,9 @@ ifdef::git-log[] -m::: This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` - is given as well. The default format could be changed using - `log.diffMerges` configuration parameter, which default value - is `separate`. + is given as well. The default format can be specified using + the configuration variable `log.diffMerges` (see + linkgit:git-config[1]). It defaults to `separate`. + --diff-merges=first-parent::: --diff-merges=1:::