| commit | d878d83ff06904bedf61c6d04295928e9d048707 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Sep 2022 23:09:46 +0000 (15 16:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Sep 2022 23:09:46 +0000 (15 16:09 -0700) | ||
| tree | 04daf671927965a65b5ee7960c326e825e5dab6f | treesnapshot (tar.gz zip) |
| parent | 36f8e7ed7d72d2ac73743c3c2226cceb29b32156 | commitdiff |
| parent | 67360b75c605e6c1458304378bda8255f72d96b9 | commitdiff |
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
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 | blobhistory |