doc/git-log: describe --diff-merges=off
Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Aug 6, 2020 at 01:08 UTC
405a2fdf998d42469634efeff8461f221bb9398b
1 file changed
+5
-1
Documentation/git-log.txt
+5
-1
@@ -145,7 +145,6 @@ combined-diff option or with `--no-diff-merges`).
145
rename or copy detection have been requested).
146
147
-m::
148
---diff-merges::
148
This flag makes the merge commits show the full diff like
149
regular commits; for each merge parent, a separate log entry
150
and diff is generated. An exception is that only diff against
@@ -153,6 +152,11 @@ combined-diff option or with `--no-diff-merges`).
152
in that case, the output represents the changes the merge
153
brought _into_ the then-current branch.
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
+
160
:git-log: 1
161
include::diff-options.txt[]
162