Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto
Show 8 quoted lines
> The new strategy resolves only two heads, and the result of the merge
> is always the second head. It can be useful with `rebase --onto`,
> because it always resolves conflicts in favor of the commits
> being applied.
>
> The patch includes an update to git-rebase's documentation, showing
> how to use the new patch to convert an "--amend"ing commit into a
> separate one, as if --amend had not been used.
Signed-Off-By: Paolo Bonzini <bonzini@gnu.org>
(i.e. forge it in my original commit message if the patch is accepted).
Paolo
Paolo Bonzini <bonzini@gnu.org>