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

	Commit message (Collapse)	Author	Age
*	rebase: allow --skip to work with --merge	Eric Wong	2006-06-25
	Now that we control the merge base selection, we won't be forced into rolling things in that we wanted to skip beforehand. Also, add a test to ensure this all works as intended. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>