Eric Wong d5e673b60b rebase: allow --skip to work with --merge ...

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>

2006-06-25 00:38:34 -07:00

4.1 KiB

Raw Blame History

View Raw