mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc/diff-options: improve wording of the log.diffMerges mention

Browse Source 
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:
Štěpán Němec
2023-10-05 11:00:52 +02:00
committed by Junio C Hamano
parent 97509a3497
commit 043465a6cf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/diff-options.txt
View File

@ -53,9 +53,9 @@ ifdef::git-log[]
-m::: -m:::
This option makes diff output for merge commits to be shown in This option makes diff output for merge commits to be shown in
the default format. `-m` will produce the output only if `-p` the default format. `-m` will produce the output only if `-p`
is given as well. The default format could be changed using is given as well. The default format can be specified using
`log.diffMerges` configuration parameter, which default value the configuration variable `log.diffMerges` (see
is `separate`. linkgit:git-config[1]). It defaults to `separate`.
+ +
--diff-merges=first-parent::: --diff-merges=first-parent:::
--diff-merges=1::: --diff-merges=1:::