tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2005-10-10	Deal with $(bindir) and friends with whitespaces.	Junio C Hamano	1	-1/+1
	... using HPA's shellquote macro. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02	[PATCH] Teach the recursive merge strategy about renames.	Fredrik Kuivinen	1	-185/+601
	It will now merge cases where a file was renamed in one branch and modified in the other branch cleanly. We also detect a couple of conflict cases now that wasn't detected before. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-25	[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.	Fredrik Kuivinen	1	-3/+9
	If the working tree is dirty read-tree will fail, and we don't want an ugly stack trace in that case. Also make sure we don't print stack traces when we use 'die'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	git-merge-recursive: Trivial RE fixes.	Junio C Hamano	1	-2/+2
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	[PATCH] Use a temporary index file when we merge the common ancestors.	Fredrik Kuivinen	1	-5/+18
	With this change we can get rid of a call to 'git-update-index --refresh'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	[PATCH] Adjust git-merge-recursive.py for the new tool names.	Fredrik Kuivinen	1	-4/+4
	Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	[PATCH] Don't output 'Automatic merge failed, ...'	Fredrik Kuivinen	1	-1/+0
	git-merge.sh does this for us. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	[PATCH] Be more like the 'resolve' strategy.	Fredrik Kuivinen	1	-35/+33
	If there are non-mergeable changes leave the head contents in the cache and update the working directory with the output from merge(1). In the add/add and delete/modify conflict cases leave unmerged cache entries in the index. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.	Fredrik Kuivinen	1	-0/+429
	Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>