projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 86f660b) | patch
rebase: Allow merge strategies to be used when rebasing
authorEric Wong <normalperson@yhbt.net>
Wed, 21 Jun 2006 10:04:41 +0000 (03:04 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Jun 2006 10:56:29 +0000 (03:56 -0700)
commit58634dbff8221f158118342975f6cd281af14fd9
tree7c11c28ddcac9bac5cb9d3ece795280ffdac5a13tree | snapshot
parent86f660b1f1dc207897281a77f969a56b2e551374commit | 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>
Documentation/git-rebase.txt diff | blob | history
git-rebase.sh diff | blob | history
Git—the stupid content tracker