From: Sergey Organov Date: Wed, 5 Aug 2020 22:08:31 +0000 (+0300) Subject: doc/git-log: describe --diff-merges=off X-Git-Tag: v2.29.0-rc0~157^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=405a2fdf998d42469634efeff8461f221bb9398b;p=thirdparty%2Fgit.git doc/git-log: describe --diff-merges=off Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 9ccba65469..f3727c7864 100644 --- 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[]