kernel/git - git - PowerEL Git System

Tree: c649657501

Author	SHA1	Message	Date
Fredrik Kuivinen	97f58b785d	merge-recursive: Speed up commit graph construction Use __slots__ to speed up construction and decrease memory consumption of the Commit objects. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Fredrik Kuivinen	857f26d2f4	merge-recursive: Add copyright notice Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Fredrik Kuivinen	88f8f0a52b	[PATCH] Enable and fix support for base less merges. Let the merge strategies handle the base less case if they are able to do it. It also fixes git-resolve.sh to die if no common ancestors exists, instead of doing the wrong thing. Furthermore, it contains a small independent fix for git-merge.sh and a fix for a base less code path in gitMergeCommon.py. With this it's possible to use git merge -s recursive 'merge message' A B to do a base less merge of A and B. [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge. I fixed a small typo in git-merge-resolve fix; 'test' equality check is spelled with single equal sign -- C-style double equal sign is bashism.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago