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>
This commit is contained in:

committed by
Junio C Hamano

parent
97509a3497
commit
043465a6cf
@ -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:::
|
||||
|
Reference in New Issue
Block a user