Hi Dominique, Dominique Quatravaux wrote: > # A---B---C---K targetbranch > # / \ > # D---E---F---G---H---I--J srcbranch > > into this: > > # A---B---C---I'---K' targetbranch > # / \ > # D---E---F---G---H'---J' srcbranch > # > > (ie I has been shoved into targetbranch). > > It seemed to me that the first step should be to simply rebase I, H, and J (in > this order) onto C. Unfortunately git rebase --interactive -p C proposes [...] I'm sorry to break this news, but "rebase --interactive --preserve-merges" (unlike "rebase --preserve-merges" without --interactive) was never implemented completely. See the BUGS section of the git-rebase man page. Luckily, there is a roadmap for anyone interested in implementing it. Maybe it could be you? See [1] and the surrounding thread. Thanks for your interest, Jonathan [1] http://thread.gmane.org/gmane.comp.version-control.git/148059/focus=148144 -- 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