git - Git: sistema de control de versiones

Age	Commit message (Collapse)	Author
2005-09-14	git-merge-recursive: Trivial RE fixes.	Junio C Hamano
	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
	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
	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
	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
	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
	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>