From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Sep 2022 23:09:46 +0000 (-0700)
Subject: Merge branch 'en/remerge-diff-fixes'
X-Git-Tag: v2.38.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d878d83ff06904bedf61c6d04295928e9d048707;p=thirdparty%2Fgit.git

Merge branch 'en/remerge-diff-fixes'

Fix a few "git log --remerge-diff" bugs.

* en/remerge-diff-fixes:
  diff: fix filtering of merge commits under --remerge-diff
  diff: fix filtering of additional headers under --remerge-diff
  diff: have submodule_format logic avoid additional diff headers
---

d878d83ff06904bedf61c6d04295928e9d048707