tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2005-06-08	One more time.. Clean up git-merge-one-file-script	Linus Torvalds	1	-42/+15
2005-06-08	Fix up git-merge-one-file-script	Linus Torvalds	1	-7/+18
2005-06-08	Merge my and Petr's git-merge-one-file-script modifications	Linus Torvalds	1	-1/+2
2005-06-08	[PATCH] git-merge-one-file-script cleanups from Cogito	Petr Baudis	1	-15/+29
2005-06-08	Make sure we error out if we can't remove a file on automatic merges.	Linus Torvalds	1	-1/+2
2005-06-08	[PATCH] Fix git-merge-one-file permissions auto-merging	Petr Baudis	1	-0/+4
2005-06-08	Leave merge failures in the filesystem	Linus Torvalds	1	-12/+19
2005-05-07	Use backticks in git-merge-one-file-script instead of $(command).	Junio C Hamano	1	-4/+4
2005-05-01	Update git-merge-one-file-script.	Junio C Hamano	1	-38/+26
2005-05-01	[PATCH] Really fix git-merge-one-file-script this time.	Junio C Hamano	1	-23/+18
2005-04-29	[PATCH] leftover bits for git rename	Junio C Hamano	1	-3/+3
2005-04-29	Update the merge scripts for the big git rename.	Linus Torvalds	1	-7/+7
2005-04-23	[PATCH] make file merging respect permissions	James Bottomley	1	-8/+39
2005-04-18	[PATCH] SCSI trees, merges and git status	James Bottomley	1	-1/+10
2005-04-18	Change merge-cache and git-merge-one-file to use the SHA1 of the file	Linus Torvalds	1	-22/+38
2005-04-18	Add the simple scripts I used to do a merge with content conflicts.	Linus Torvalds	1	-0/+35