Merge branch 'ab/pathname-encoding-doc'

[thirdparty/git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 69de49f977b63ea547e43175490f762c00b6835c..530d1159141fdcda26266056fd0a4822b279ab7b 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -34,7 +34,7 @@ endif::git-diff[]
 endif::git-format-patch[]
 
 ifdef::git-log[]
---diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)::
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
 --no-diff-merges::
        Specify diff format to be used for merge commits. Default is
        {diff-merges-default} unless `--first-parent` is in use, in which case
@@ -45,17 +45,24 @@ ifdef::git-log[]
        Disable output of diffs for merge commits. Useful to override
        implied value.
 +
+--diff-merges=on:::
+--diff-merges=m:::
+-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`.
++
 --diff-merges=first-parent:::
 --diff-merges=1:::
        This option makes merge commits show the full diff with
        respect to the first parent only.
 +
 --diff-merges=separate:::
---diff-merges=m:::
--m:::
        This makes merge commits show the full diff with respect to
        each of the parents. Separate log entry and diff is generated
-       for each parent. `-m` doesn't produce any output without `-p`.
+       for each parent.
 +
 --diff-merges=combined:::
 --diff-merges=c:::