diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-24 21:43:09 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-07-27 10:59:42 -0700 |
| commit | fb47cfbd59b12ea67e1a5c6a9d0bd665fcae4581 (patch) | |
| tree | ee9bd166d2cbc97374b99b22fe1cabc8a7eaba5f /gitk | |
| parent | git-stash: do not remove a ref by hand. (diff) | |
| download | tgif-fb47cfbd59b12ea67e1a5c6a9d0bd665fcae4581.tar.xz | |
rebase -i: fix interrupted squashing
When a squashing merge failed, the first commit would not be replaced,
due to "git reset --soft" being called with an unmerged index.
Noticed by Uwe Kleine-König.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitk')
0 files changed, 0 insertions, 0 deletions