@@ -37,81 +37,87 @@ endif::git-diff[]
37
37
endif::git-format-patch[]
38
38
39
39
ifdef::git-log[]
40
- -m ::
40
+ `-m` ::
41
41
Show diffs for merge commits in the default format. This is
42
42
similar to `--diff-merges=on` , except `-m` will
43
43
produce no output unless `-p` is given as well.
44
44
45
- -c ::
45
+ `-c` ::
46
46
Produce combined diff output for merge commits.
47
47
Shortcut for `--diff-merges=combined -p` .
48
48
49
- -- cc::
49
+ ` --cc` ::
50
50
Produce dense combined diff output for merge commits.
51
51
Shortcut for `--diff-merges=dense-combined -p` .
52
52
53
- -- dd::
53
+ ` --dd` ::
54
54
Produce diff with respect to first parent for both merge and
55
55
regular commits.
56
56
Shortcut for `--diff-merges=first-parent -p` .
57
57
58
- -- remerge-diff::
58
+ ` --remerge-diff` ::
59
59
Produce remerge-diff output for merge commits.
60
60
Shortcut for `--diff-merges=remerge -p` .
61
61
62
- -- no-diff-merges::
62
+ ` --no-diff-merges` ::
63
63
Synonym for `--diff-merges=off` .
64
64
65
- -- diff-merges=<format >::
65
+ ` --diff-merges=<format>` ::
66
66
Specify diff format to be used for merge commits. Default is
67
67
{diff-merges-default} unless `--first-parent` is in use, in
68
68
which case `first-parent` is the default.
69
69
+
70
70
The following formats are supported:
71
71
+
72
72
--
73
- off, none::
73
+ `off` ::
74
+ `none` ::
74
75
Disable output of diffs for merge commits. Useful to override
75
76
implied value.
76
77
77
- on, m::
78
+ `on` ::
79
+ `m` ::
78
80
Make diff output for merge commits to be shown in the default
79
81
format. The default format can be changed using
80
82
`log.diffMerges` configuration variable, whose default value
81
83
is `separate` .
82
84
83
- first-parent, 1::
85
+ `first-parent` ::
86
+ `1` ::
84
87
Show full diff with respect to first parent. This is the same
85
88
format as `--patch` produces for non-merge commits.
86
89
87
- separate::
90
+ ` separate` ::
88
91
Show full diff with respect to each of parents.
89
92
Separate log entry and diff is generated for each parent.
90
93
91
- combined, c::
94
+ `combined` ::
95
+ `c` ::
92
96
Show differences from each of the parents to the merge
93
97
result simultaneously instead of showing pairwise diff between
94
98
a parent and the result one at a time. Furthermore, it lists
95
99
only files which were modified from all parents.
96
100
97
- dense-combined, cc::
101
+ `dense-combined` ::
102
+ `cc` ::
98
103
Further compress output produced by `--diff-merges=combined`
99
104
by omitting uninteresting hunks whose contents in the parents
100
105
have only two variants and the merge result picks one of them
101
106
without modification.
102
107
103
- remerge, r ::
104
- Remerge two-parent merge commits to create a temporary tree
108
+ ` remerge` ::
109
+ `r` :: Remerge two-parent merge commits to create a temporary tree
105
110
object-- potentially containing files with conflict markers
106
111
and such. A diff is then shown between that temporary tree
107
112
and the actual merge commit.
113
+ --
108
114
+
109
115
The output emitted when this option is used is subject to change, and
110
116
so is its interaction with other options (unless explicitly
111
117
documented).
112
- --
113
118
114
- -- combined-all-paths::
119
+
120
+ `--combined-all-paths` ::
115
121
Cause combined diffs (used for merge commits) to
116
122
list the name of the file from all parents. It thus only has
117
123
effect when `--diff-merges=[dense-]combined` is in use, and
0 commit comments