Johannes Schindelin 1d25c8cf82 rebase -i: fix squashing corner case ...

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.

Noticed by Johannes Sixt.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2007-08-23 02:34:19 -07:00

11 KiB

Executable File

Raw Blame History

View Raw