tree f2e35ad1607e81d578c6ffe9798b7129c1579f05
parent 7cfaa86fe6f61698752d13c59ac97a102d1fbaae
parent 6a38e33331560c3e84123c567f95de72d1cfa506
author Junio C Hamano <gitster@pobox.com> 1628710578 -0700
committer Junio C Hamano <gitster@pobox.com> 1628710578 -0700

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"'