]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36f8e7e 67360b7)
Merge branch 'en/remerge-diff-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2022 23:09:46 +0000 (16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2022 23:09:46 +0000 (16:09 -0700)
commitd878d83ff06904bedf61c6d04295928e9d048707
tree04daf671927965a65b5ee7960c326e825e5dab6ftree | snapshot
parent36f8e7ed7d72d2ac73743c3c2226cceb29b32156commit | diff
parent67360b75c605e6c1458304378bda8255f72d96b9commit | diff
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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.