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@xxxxxxx> (i.e. forge it in my original commit message if the patch is accepted). Paolo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
