From: Štěpán Němec Date: Thu, 05 Oct 2023 09:00:52 GMT Subject: [PATCH v2 2/5] doc/diff-options: improve wording of the log.diffMerges mention Message-ID: <20231005090055.3097783-2-stepnem@smrk.net> In-Reply-To: <20231005090055.3097783-1-stepnem@smrk.net> 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 --- Documentation/diff-options.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index ee256ec077be..48a5012748dd 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::: -- 2.42.0