tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2006-01-27	merge: seed the commit message with list of conflicted files.	Junio C Hamano	1	-0/+8
2005-12-23	merge --no-commit: tweak message	Junio C Hamano	1	-1/+10
2005-12-14	Trivial usage string clean-up	freku045@student.liu.se	1	-4/+2
2005-12-13	[PATCH] allow merging any committish	Junio C Hamano	1	-1/+4
2005-12-03	git-merge: Exit with code 2 if no strategy was able to handle the merge.	Fredrik Kuivinen	1	-1/+2
2005-11-25	git-sh-setup: die if outside git repository.	Junio C Hamano	1	-1/+1
2005-11-23	git-merge: make recursive the default strategy	Junio C Hamano	1	-8/+12
2005-11-09	Use 'merge-base --all' where applicable.	Junio C Hamano	1	-2/+9
2005-11-03	Add 'ours' merge strategy.	Junio C Hamano	1	-1/+1
2005-11-03	Add --no-commit to git-merge/git-pull.	Junio C Hamano	1	-10/+18
2005-10-28	Documentation changes to recursive option for git-diff-tree	Chris Shoemaker	1	-1/+1
2005-10-22	Allow git-merge not to commit.	Junio C Hamano	1	-11/+17
2005-10-03	[PATCH] Enable and fix support for base less merges.	Fredrik Kuivinen	1	-2/+2
2005-10-02	Handle really trivial case inside git-merge.	Junio C Hamano	1	-1/+21
2005-09-28	Use git-update-ref in scripts.	Junio C Hamano	1	-4/+5
2005-09-28	Fastpath the normal case by not checking that index matches HEAD.	Junio C Hamano	1	-7/+4
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