2 commits

Author	SHA1	Message	Date
Junio C Hamano	5be60078c9	Rewrite "git-frotz" to "git frotz" ... This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>	2007-07-02 22:52:14 -07:00
Junio C Hamano	2276aa6c09	Use Daniel's read-tree in the merge strategy 'resolve'. ... And rename the one Linus kept calling stupid, 'stupid'. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-09-10 18:30:41 -07:00