diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-21 03:04:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 03:56:29 -0700 |
| commit | 58634dbff8221f158118342975f6cd281af14fd9 (patch) | |
| tree | 7c11c28ddcac9bac5cb9d3ece795280ffdac5a13 /t/t3402-rebase-merge.sh | |
| parent | 86f660b1f1dc207897281a77f969a56b2e551374 (diff) | |
| download | git-58634dbff8221f158118342975f6cd281af14fd9.tar.gz git-58634dbff8221f158118342975f6cd281af14fd9.tar.xz | |
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>
Diffstat (limited to 't/t3402-rebase-merge.sh')
0 files changed, 0 insertions, 0 deletions