rebase: Support preserving merges in non-interactive mode