tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2005-08-05	[PATCH] Fix git-merge-cache -q	Petr Baudis	1	-2/+2
	I'm totally stupid and got it backwards, sorry about that. git-merge-cache -q would mean it's noisy and quiet without any parameters. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01	[PATCH] git-merge-cache -q doesn't complain about failing merge program	Petr Baudis	1	-8/+15
	git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-19	[PATCH] cleanup of in-code names	Alexey Nezhdanov	1	-4/+4
	Fixes all in-code names that leaved during "big name change". Signed-off-by: Alexey Nezhdanov <snake@penza-gsm.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-11	git-merge-cache -o does all the automerges in a single shot	Petr Baudis	1	-5/+15
	When you pass git-merge-cache the -o option, it tries to do all the automatic merges and possibly return error if any of them failed, instead of the default behaviour of failing immediately after the first failed automatic merge. Ported from the Cogito branch - Cogito needs this behaviour.
2005-05-07	Make merge-cache not fail immediatelly when the merge program	Petr Baudis	1	-1/+4
	fails, but go on and return error code at the end. It makes sense to try to merge everything, then let the user solve the commits at once.
2005-04-23	[PATCH] make file merging respect permissions	James Bottomley	1	-1/+10
	1) permissions aren't respected in the merge script (primarily because they're never passed in to it in the first place). Fix that and also check for permission conflicts in the merge 2) the delete of a file in both branches may indeed be just that, but it could also be the indicator of a rename conflict (file moved to different locations in both branches), so error out and ask the committer for guidance. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-18	Change merge-cache and git-merge-one-file to use the SHA1 of the file	Linus Torvalds	1	-24/+3
	instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".
2005-04-17	Ass a "merge-cache" helper program to execute a merge on	Linus Torvalds	1	-0/+127
	any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.