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

	Commit message (Collapse)	Author	Age
*	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	2007-07-02
\| \| \| \| \| \|	This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	tests: merge-recursive is usable without Python	Junio C Hamano	2006-10-27
\| \| \| \| \| \| \|	Many tests still protected themselves with $no_python; there is no need to do so anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	rebase: allow --merge option to handle patches merged upstream	Eric Wong	2006-06-25
\| \| \| \| \| \| \| \|	Enhance t3401-rebase-partial to test with --merge as well as the standard am -3 strategy. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Add a test for rebase when a change was picked upstream	Yann Dirson	2006-01-08
	This test exercises the standard feature that makes rebase useful. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>