diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-11 21:36:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-11 21:36:18 +0200 |
| commit | 4c90d8908ac0c7ec9cd8d2caee7a1a0394636612 (patch) | |
| tree | f2e35ad1607e81d578c6ffe9798b7129c1579f05 /mergetools | |
| parent | Merge branch 'cb/many-alternate-optim-fixup' (diff) | |
| parent | Revert 'diff-merges: let "-m" imply "-p"' (diff) | |
| download | git-4c90d8908ac0c7ec9cd8d2caee7a1a0394636612.tar.xz git-4c90d8908ac0c7ec9cd8d2caee7a1a0394636612.zip | |
Merge branch 'jn/log-m-does-not-imply-p'
Earlier "git log -m" was changed to always produce patch output,
which would break existing scripts, which has been reverted.
* jn/log-m-does-not-imply-p:
Revert 'diff-merges: let "-m" imply "-p"'
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions