git - Mirror of https://git.kernel.org/pub/scm/git/git.git/

Age	Commit message (Collapse)	Author	Files	Lines
2005-09-19	Ship our own copy of subprocess.py	Junio C Hamano	1	-6/+0
	so people without the latest Python could run merge-recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	[PATCH] Use the 'die' function where it is appropriate.	Fredrik Kuivinen	1	-14/+13
	Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-12	[PATCH] Make the ProgramError class printable.	Fredrik Kuivinen	1	-0/+3
	Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-12	[PATCH] Introduce a 'die' function.	Fredrik Kuivinen	1	-4/+8
	Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10	Add a new merge strategy by Fredrik Kuivinen.	Junio C Hamano	1	-0/+268
	I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano <junkio@cox.net>