| commit | 1d25c8cf82eead72e11287d574ef72d3ebec0db1 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Thu, 23 Aug 2007 08:55:41 +0000 (23 09:55 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Aug 2007 09:34:19 +0000 (23 02:34 -0700) | ||
| tree | e25c7e019c227f783bc99d4d31a9270cca6d4395 | treesnapshot (tar.gz zip) |
| parent | 191131e538dd4188dbada7ce871f80af80556292 | commitdiff |
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>
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>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |