tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2005-09-02	scripts: equality test '==' is not portable.	Junio C Hamano	1	-4/+6
2005-08-23	Try to find the optimum merge base while resolving.	Junio C Hamano	1	-1/+35
2005-08-20	git-resolve: dying is good, not showing help is bad.	Junio C Hamano	1	-4/+8
2005-08-13	[PATCH] Make sure git-resolve-script always works on commits	Linus Torvalds	1	-2/+2
2005-07-22	[PATCH] Audit rev-parse users.	Junio C Hamano	1	-2/+2
2005-07-08	Make "git resolve" take the merge message in $3	Linus Torvalds	1	-4/+3
2005-07-08	Add "git-sh-setup-script" for common git shell script setup	Linus Torvalds	1	-9/+5
2005-06-21	Clean up different special *HEAD handling	Linus Torvalds	1	-2/+2
2005-06-20	[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse	Dan Holmsand	1	-9/+15
2005-06-19	Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.	Linus Torvalds	1	-1/+3
2005-06-14	Trivial git script fixups	Linus Torvalds	1	-0/+0
2005-06-08	Make "git commit" work correctly in the presense of a manual merge	Linus Torvalds	1	-1/+2
2005-06-08	Make default merge messages denser.	Linus Torvalds	1	-2/+1
2005-06-06	git-resolve-script: stop when the automated merge fails	Linus Torvalds	1	-1/+5
2005-06-06	git-resolve-script: don't wait for three seconds any more	Linus Torvalds	1	-3/+0
2005-06-05	More work on merging with git-read-tree..	Linus Torvalds	1	-4/+2
2005-06-05	git-read-tree: be a lot more careful about merging dirty trees	Linus Torvalds	1	-2/+3
2005-05-30	git-resolve-script: use "git-apply --stat" instead of diffstat	Linus Torvalds	1	-2/+2
2005-05-25	[PATCH] optimize git-resolve-script	Jeff Garzik	1	-2/+2
2005-05-09	Introduce GIT_DIR environment variable.	Junio C Hamano	1	-5/+10
2005-05-05	Fix git-resolve-script.	Linus Torvalds	1	-1/+1
2005-05-05	Split "git-pull-script" into two parts	Linus Torvalds	1	-0/+56