File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -145,14 +145,18 @@ combined-diff option or with `--no-diff-merges`).
145
145
rename or copy detection have been requested).
146
146
147
147
-m::
148
- --diff-merges::
149
148
This flag makes the merge commits show the full diff like
150
149
regular commits; for each merge parent, a separate log entry
151
150
and diff is generated. An exception is that only diff against
152
151
the first parent is shown when `--first-parent` option is given;
153
152
in that case, the output represents the changes the merge
154
153
brought _into_ the then-current branch.
155
154
155
+ --diff-merges=off::
156
+ --no-diff-merges::
157
+ Disable output of diffs for merge commits (default). Useful to
158
+ override `-m`, `-c`, or `--cc`.
159
+
156
160
:git-log: 1
157
161
include::diff-options.txt[]
158
162
You can’t perform that action at this time.
0 commit comments