From: Sébastien Barthélemy <barthelemy@crans.org>
Date: Tue, 12 Oct 2010 15:23:18 GMT
Subject: Re: rebase converts merge commits
Message-ID: <AANLkTinZzBGtC9q7J=xD1e7c80O4THdP00+mp==8hbQA@mail.gmail.com>
In-Reply-To: <20101012145824.GF22067@login.drsnuggles.stderr.nl>

Hi Matthijs,

2010/10/12 Matthijs Kooijman <matthijs@stdin.nl>:
> Have you tried the --preserve-merges option to rebase?

No, I didn't know about this option. Thank you for the tip.

I just tried, and it does not work either. The merge commit is
preserved, but the commit I'm push back in time is lost.

There is a warning against this kind behaviour when using both
--interactive and rebase.

Thanks,
-- 
Sebastian