diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-18 00:02:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-18 00:02:50 (GMT) |
| commit | a555b514cd47f59b43f571eaff6b8cd7c01f0d11 (patch) | |
| tree | 1e73f9b75a386aed0efaf103786e2d1d639d0284 /t/t4013-diff-various.sh | |
| parent | eca8c62a50e033ce6a4f4e065bb507ca3d98e75c (diff) | |
| parent | 298889d3e2053cf903b01fbac902cbfb210109ea (diff) | |
| download | git-a555b514cd47f59b43f571eaff6b8cd7c01f0d11.zip git-a555b514cd47f59b43f571eaff6b8cd7c01f0d11.tar.gz git-a555b514cd47f59b43f571eaff6b8cd7c01f0d11.tar.bz2 | |
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 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 2a57f90..5f97dd6 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -298,6 +298,8 @@ log --root -c --patch-with-stat --summary master # improved by Timo's patch log --root --cc --patch-with-stat --summary master log --no-diff-merges -p --first-parent master +log --diff-merges=off -p --first-parent master +log --first-parent --diff-merges=off -p master log -p --first-parent master log -m -p --first-parent master log -m -p master |