diff options
| author | Štěpán Němec <stepnem@smrk.net> | 2023-10-05 11:00:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-05 12:55:38 -0700 |
| commit | 043465a6cf251202171b70b304b02dc306eff5f8 (patch) | |
| tree | f63db135935475c1a698f0f57a010691ec7b008e /Documentation/diff-options.txt | |
| parent | 97509a3497cf864bb1ed26229feb9437f76a30ee (diff) | |
| download | git-043465a6cf251202171b70b304b02dc306eff5f8.tar.gz | |
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>
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
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::: |