diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-08-23 09:55:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-23 02:34:19 -0700 |
| commit | 1d25c8cf82eead72e11287d574ef72d3ebec0db1 (patch) | |
| tree | e25c7e019c227f783bc99d4d31a9270cca6d4395 /builtin-write-tree.c | |
| parent | 191131e538dd4188dbada7ce871f80af80556292 (diff) | |
| download | git-1d25c8cf82eead72e11287d574ef72d3ebec0db1.tar.gz git-1d25c8cf82eead72e11287d574ef72d3ebec0db1.tar.xz | |
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>
Diffstat (limited to 'builtin-write-tree.c')
0 files changed, 0 insertions, 0 deletions