rebase: allow --merge option to handle patches merged upstream