averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-04 22:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,747 Commits 6 Branches 996 Tags
365527adbfa8a16dfc05ab71818602f55ada55ba
Commit Graph

3 Commits

Author SHA1 Message Date
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