doc/git-log: describe --diff-merges=off

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 9ccba65469d7c6bc42fc8fb2de6fef36b1969061..f3727c78645346d1e78d2aafba8691f20af5f629 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -145,7 +145,6 @@ combined-diff option or with `--no-diff-merges`).
        rename or copy detection have been requested).
 
 -m::
---diff-merges::
        This flag makes the merge commits show the full diff like
        regular commits; for each merge parent, a separate log entry
        and diff is generated. An exception is that only diff against
@@ -153,6 +152,11 @@ combined-diff option or with `--no-diff-merges`).
        in that case, the output represents the changes the merge
        brought _into_ the then-current branch.
 
+--diff-merges=off::
+--no-diff-merges::
+       Disable output of diffs for merge commits (default). Useful to
+       override `-m`, `-c`, or `--cc`.
+
 :git-log: 1
 include::diff-options.txt[]