Skip to content

Commit 405a2fd

Browse files
sorganovgitster
authored andcommitted
doc/git-log: describe --diff-merges=off
Signed-off-by: Sergey Organov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6501580 commit 405a2fd

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Documentation/git-log.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,18 @@ combined-diff option or with `--no-diff-merges`).
145145
rename or copy detection have been requested).
146146

147147
-m::
148-
--diff-merges::
149148
This flag makes the merge commits show the full diff like
150149
regular commits; for each merge parent, a separate log entry
151150
and diff is generated. An exception is that only diff against
152151
the first parent is shown when `--first-parent` option is given;
153152
in that case, the output represents the changes the merge
154153
brought _into_ the then-current branch.
155154

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+
156160
:git-log: 1
157161
include::diff-options.txt[]
158162

0 commit comments

Comments
 (0)