From: Joshua Jensen <jjensen@workspacewhiz.com>
Date: Wed, 20 Oct 2010 17:44:52 GMT
Subject: Re: git rebase and merge commits
Message-ID: <4CBF2A94.1030206@workspacewhiz.com>
In-Reply-To: <20101020173201.GA10537@burratino>

----- Original Message -----
From: Jonathan Nieder
Date: 10/20/2010 11:32 AM
> 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
I applied that patch to my git-rebase--interactive, although it did not 
cleanly apply.  I hacked a few bits to get it going again.  I could post 
the entire file here, if someone wants to clean it up.

It does properly rebase the first-parent merges fine.

Josh