From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Sat, 22 Mar 2008 01:52:52 GMT
Subject: Re: [PATCH] rebase with preserve merges should not show merged commits
Message-ID: <20080322015252.GA7570@atjola.homenet>
In-Reply-To: <1206148785-29466-1-git-send-email-joerg@alea.gnuu.de>

On 2008.03.22 02:19:42 +0100, Jörg Sommer wrote:
> The current version of git-rebase--interactive shows the user the commits
> coming from a merge.
> 
> M---A---B
>  \       \
>   o---o---+---o branch
> 
> Rebasing branch on M with preserve merges gives the commits A and B. But
> if you mark them for editing or remove them the rebase fails. You must
> keep them as they are. It's useless to bother the user with these commits
> and might lead to mistakes.

Uhm, why do you completely remove the possibility to edit A instead of
fixing the code so that the editing actually works?

Björn