diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:50 -0700 |
| commit | a555b514cd47f59b43f571eaff6b8cd7c01f0d11 (patch) | |
| tree | 1e73f9b75a386aed0efaf103786e2d1d639d0284 /Documentation | |
| parent | Merge branch 'jk/log-fp-implies-m' (diff) | |
| parent | t/t4013: add test for --diff-merges=off (diff) | |
| download | tgif-a555b514cd47f59b43f571eaff6b8cd7c01f0d11.tar.xz | |
Merge branch 'so/log-diff-merges-opt'
Earlier, to countermand the implicit "-m" option when the
"--first-parent" option is used with "git log", we added the
"--[no-]diff-merges" option in the jk/log-fp-implies-m topic. To
leave the door open to allow the "--diff-merges" option to take
values that instructs how patches for merge commits should be
computed (e.g. "cc"? "-p against first parent?"), redefine
"--diff-merges" to take non-optional value, and implement "off"
that means the same thing as "--no-diff-merges".
* so/log-diff-merges-opt:
t/t4013: add test for --diff-merges=off
doc/git-log: describe --diff-merges=off
revision: change "--diff-merges" option to require parameter
Diffstat (limited to 'Documentation')
| -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 27fa0ea26d..2b8ac5ff88 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -148,7 +148,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 @@ -156,6 +155,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[] |