undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,833 Commits 1 Branch 0 Tags 217 MiB
8be707de55
Commit Graph

5 Commits

Author SHA1 Message Date
Junio C Hamano
343d35c916 Ship our own copy of subprocess.py 
so people without the latest Python could run merge-recursive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-19 19:47:54 -07:00
Fredrik Kuivinen
daae669949 [PATCH] Use the 'die' function where it is appropriate. 
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-13 15:45:26 -07:00
Fredrik Kuivinen
4e48fe3f1c [PATCH] Make the ProgramError class printable. 
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-12 14:54:00 -07:00
Fredrik Kuivinen
654291a2ac [PATCH] Introduce a 'die' function. 
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2005-09-12 14:53:58 -07:00
Junio C Hamano
720d150c48 Add a new merge strategy by Fredrik Kuivinen. 
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>
 2005-09-10 19:46:53 -07:00