From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Aug 2021 19:36:18 +0000 (-0700)
Subject: Merge branch 'jn/log-m-does-not-imply-p'
X-Git-Tag: v2.33.0-rc2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c90d8908ac0c7ec9cd8d2caee7a1a0394636612;p=thirdparty%2Fgit.git

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

4c90d8908ac0c7ec9cd8d2caee7a1a0394636612