git - git

	Commit message (Collapse)	Author	Age	Files	Lines
*	rebase: allow --merge option to handle patches merged upstream	Eric Wong	2006-06-25	1	-1/+12
\| \| \| \| \| \| \| \|	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	1	-0/+53
	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>