commit | 58634dbff8221f158118342975f6cd281af14fd9 | [log] [tgz] |
---|---|---|
author | Eric Wong <normalperson@yhbt.net> | Wed Jun 21 03:04:41 2006 -0700 |
committer | Junio C Hamano <junkio@cox.net> | Wed Jun 21 03:56:29 2006 -0700 |
tree | 7c11c28ddcac9bac5cb9d3ece795280ffdac5a13 | |
parent | 86f660b1f1dc207897281a77f969a56b2e551374 [diff] |
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>