From: Kevin Ballard <kevin@sb.org>
Date: Tue, 12 Oct 2010 20:27:06 GMT
Subject: Re: rebase converts merge commits
Message-ID: <523A21BF-F6A1-4BF2-8385-941B61BA769F@sb.org>
In-Reply-To: <AANLkTikz0yUv9+EcT-kVwniUf9xnRe=_y96euNb=stzP@mail.gmail.com>

On Oct 12, 2010, at 7:55 AM, Sébastien Barthélemy wrote:

> By the way, if there is a way to do what I want, please tell me.

Your history is short enough that if you can't get rebase to do what you want, you could always do it by hand. Create a temp branch to work on based on the bad commit, cherry-pick the good commit with --no-commit, then amend the bad commit. Then just cherry-pick each subsequent commit until you get to the merge. Re-perform the merge. Then just continue to cherry-pick subsequent commits. It's not ideal, but it should work.

-Kevin Ballard