From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 12 Oct 2010 14:58:25 GMT
Subject: Re: rebase converts merge commits
Message-ID: <20101012145824.GF22067@login.drsnuggles.stderr.nl>
In-Reply-To: <AANLkTikz0yUv9+EcT-kVwniUf9xnRe=_y96euNb=stzP@mail.gmail.com>

Hi Sébastien,

> Yet, I have a problem while trying to rebase a bit of history which contains
> merge commits.

Have you tried the --preserve-merges option to rebase?

Gr.

Matthijs