rebase: allow --skip to work with --merge