diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-08-06 01:08:31 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-11 14:20:27 -0700 |
| commit | 405a2fdf998d42469634efeff8461f221bb9398b (patch) | |
| tree | cbdfc5ab274c5b2f985af87503ba71c29962bcd7 /Documentation/git-log.txt | |
| parent | revision: change "--diff-merges" option to require parameter (diff) | |
| download | tgif-405a2fdf998d42469634efeff8461f221bb9398b.tar.xz | |
doc/git-log: describe --diff-merges=off
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 6 |
1 files changed, 5 insertions, 1 deletions
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[] |