summaryrefslogtreecommitdiff
path: root/t/t4069-remerge-diff.sh
Commit message (Expand)AuthorAgeFilesLines
* diff: fix filtering of merge commits under --remerge-diffElijah Newren2022-09-021-0/+5
* diff: fix filtering of additional headers under --remerge-diffElijah Newren2022-09-021-1/+16
* diff: have submodule_format logic avoid additional diff headersElijah Newren2022-09-021-0/+8
* log: fix a memory leak in "git show <revision>..."Ævar Arnfjörð Bjarmason2022-08-031-0/+1
* diff-merges: avoid history simplifications when diffing mergesElijah Newren2022-02-021-1/+57
* show, log: include conflict/warning messages in --remerge-diff headersElijah Newren2022-02-021-0/+144
* show, log: provide a --remerge-diff capabilityElijah Newren2022-02-021-0/+91