rebase -i -p: allow making a new merge