Re: git rebase and merge commits

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 20, 2010, 17:32 UTC
Message-ID: <20101020173201.GA10537@burratino>
In-Reply-To: <AANLkTikroNPehcyBsueCnJ5hR0idd3cBP4m1KNccdRqL@mail.gmail.com>

Hi Dominique,

Dominique Quatravaux wrote:

Show 15 quoted lines

> #        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