org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	Ship our own copy of subprocess.py	Junio C Hamano	2005-09-19
\| \| \| \| \| \|	so people without the latest Python could run merge-recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	[PATCH] Use the 'die' function where it is appropriate.	Fredrik Kuivinen	2005-09-13
\| \| \| \| \|	Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	[PATCH] Make the ProgramError class printable.	Fredrik Kuivinen	2005-09-12
\| \| \| \| \|	Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	[PATCH] Introduce a 'die' function.	Fredrik Kuivinen	2005-09-12
\| \| \| \| \|	Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Add a new merge strategy by Fredrik Kuivinen.	Junio C Hamano	2005-09-10
	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>