From: Junio C Hamano <junkio@cox.net>
Date: Tue, 17 Jan 2006 08:56:21 GMT
Subject: Re: git rebase behaviour changed?
Message-ID: <7vhd83b5ca.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vvewjb5xz.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

> You are right.  We will lose #1 and #2, (although the "already
> up to date" might catch some cases) and this _is_ dangerous.  I
> need to do something about this soon.

Actually, I think we are OK; I do not think we would lose any
commits.  git-format-patch (actually, git-cherry called from
there) does the right thing.  It does not use the merge base
done in git-rebase in any way.

In any case, we _do_ need an explanation and error-out upon
finding a merge, as we discussed.  If somebody really wants to
rebase a merge, he can do that by hand, as Mike easily
demonstrated.