From: Paolo Bonzini <bonzini@gnu.org>
Date: Fri, 06 Jun 2008 11:28:05 GMT
Subject: Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto
Message-ID: <48491F45.3070100@gnu.org>
In-Reply-To: <E1K4a1Q-0002hq-QE@fencepost.gnu.org>

Paolo Bonzini wrote:
> 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