From: Johannes Sixt <j.sixt@eudaptics.com>
Date: Fri, 24 Aug 2007 07:18:45 GMT
Subject: Re: [PATCH] rebase -i: fix squashing corner case
Message-ID: <46CE8655.1DD79C48@eudaptics.com>
In-Reply-To: <Pine.LNX.4.64.0708222334510.20400@racer.site>

Johannes Schindelin wrote:
> 
> When squashing, rebase -i did not prevent fast forwards.  This could
> happen when picking some other commit than the first one, and then
> squashing the first commit.  So do not allow fast forwards when
> squashing.

This indeed fixes the problem. Hence:

Acked-by: Johannes Sixt <johannes.sixt@telecom.at>

Junio, please apply.

-- Hannes