tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2005-09-26	Give default merge message after failed automerge.	Junio C Hamano	1	-4/+10
2005-09-26	Fix overzealous cleanliness check in git-merge	Junio C Hamano	1	-18/+50
2005-09-25	[PATCH] More descriptive messages for conflict cases in merges	Fredrik Kuivinen	1	-3/+4
2005-09-13	[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.	Fredrik Kuivinen	1	-2/+2
2005-09-12	Fix off-by-one error in git-merge	Junio C Hamano	1	-1/+1
2005-09-10	Add a new merge strategy by Fredrik Kuivinen.	Junio C Hamano	1	-1/+1
2005-09-10	Use Daniel's read-tree in the merge strategy 'resolve'.	Junio C Hamano	1	-3/+3
2005-09-10	Multi-backend merge driver.	Junio C Hamano	1	-0/+212