doc/diff-options: document new --diff-merges features
Document changes in -m and --diff-merges=m semantics, as well as new --diff-merges=on option. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Apr 13, 2021 at 14:41 UTC
364bc11fe5711fe7fbb98abf376168a207e7a448
1 file changed
+11
-4
Documentation/diff-options.txt
+11
-4
@@ -34,7 +34,7 @@ endif::git-diff[]
34
endif::git-format-patch[]
35
36
ifdef::git-log[]
37
---diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)::
37
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
38
--no-diff-merges::
39
Specify diff format to be used for merge commits. Default is
40
{diff-merges-default} unless `--first-parent` is in use, in which case
@@ -45,17 +45,24 @@ ifdef::git-log[]
45
Disable output of diffs for merge commits. Useful to override
46
implied value.
47
+
48
+--diff-merges=on:::
49
+--diff-merges=m:::
50
+-m:::
51
+ This option makes diff output for merge commits to be shown in
52
+ the default format. `-m` will produce the output only if `-p`
53
+ is given as well. The default format could be changed using
54
+ `log.diffMerges` configuration parameter, which default value
55
+ is `separate`.
56
++
57
--diff-merges=first-parent:::
58
--diff-merges=1:::
59
This option makes merge commits show the full diff with
60
respect to the first parent only.
61
+
62
--diff-merges=separate:::
54
---diff-merges=m:::
55
--m:::
63
This makes merge commits show the full diff with respect to
64
each of the parents. Separate log entry and diff is generated
58
- for each parent. `-m` doesn't produce any output without `-p`.
65
+ for each parent.
66
+
67
--diff-merges=combined:::
68
--diff-merges=c:::