tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2022-02-02	show, log: include conflict/warning messages in --remerge-diff headers	Elijah Newren	1	-0/+10
2021-05-20	merge-ort: avoid accidental API mis-use	Elijah Newren	1	-0/+2
2020-12-16	merge-ort: implement merge_incore_recursive()	Elijah Newren	1	-0/+10
2020-12-13	merge-ort: add an err() function similar to one from merge-recursive	Elijah Newren	1	-1/+8
2020-10-26	merge-ort: barebones API of new merge strategy with empty implementation	Elijah Newren	1	-0/+58