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@xxxxxxxxxx> Junio, please apply. -- Hannes - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html