diff options
| -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::: |