[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: [PATCH] rebase -i: fix squashing corner case
From:       Johannes Sixt <J.Sixt () eudaptics ! com>
Date:       2007-08-24 7:18:45
Message-ID: 46CE8655.1DD79C48 () eudaptics ! com
[Download RAW message or body]

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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]