summaryrefslogtreecommitdiffstats
path: root/t/t4069-remerge-diff.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/log-remerge-keep-ancestry'Junio C Hamano2024-12-191-0/+7
|\
| * log: --remerge-diff needs to keep around commit parentsJohannes Schindelin2024-12-131-0/+7
* | t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* | Merge branch 'ps/leakfixes-part-4'Junio C Hamano2024-08-231-0/+1
|\ \
| * | diff: free state populated via optionsPatrick Steinhardt2024-08-141-0/+1
| |/
* / diff-tree: fix crash when used with --remerge-diffXing Xin2024-08-091-0/+35
|/
* 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