tree 7c11c28ddcac9bac5cb9d3ece795280ffdac5a13
parent 86f660b1f1dc207897281a77f969a56b2e551374
author Eric Wong <normalperson@yhbt.net> 1150884281 -0700
committer Junio C Hamano <junkio@cox.net> 1150887389 -0700

rebase: Allow merge strategies to be used when rebasing

This solves the problem of rebasing local commits against an
upstream that has renamed files.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>