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 <stepnem@smrk.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Štěpán Němec committed
Oct 5, 2023 at 11:00 UTC
043465a6cf251202171b70b304b02dc306eff5f8
1 file changed
+3
-3
Documentation/diff-options.txt
+3
-3
@@ -53,9 +53,9 @@ ifdef::git-log[]
53
-m:::
54
This option makes diff output for merge commits to be shown in
55
the default format. `-m` will produce the output only if `-p`
56
- is given as well. The default format could be changed using
57
- `log.diffMerges` configuration parameter, which default value
58
- is `separate`.
56
+ is given as well. The default format can be specified using
57
+ the configuration variable `log.diffMerges` (see
58
+ linkgit:git-config[1]). It defaults to `separate`.
59
+
60
--diff-merges=first-parent:::
61
--diff-merges=1:::