Skip to content

Commit 043465a

Browse files
stepnemgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 97509a3 commit 043465a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/diff-options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ ifdef::git-log[]
5353
-m:::
5454
This option makes diff output for merge commits to be shown in
5555
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`.
5959
+
6060
--diff-merges=first-parent:::
6161
--diff-merges=1:::

0 commit comments

Comments
 (0)