summaryrefslogtreecommitdiff
path: root/ppc/sha1ppc.S
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-24 21:43:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-07-27 10:59:42 -0700
commitfb47cfbd59b12ea67e1a5c6a9d0bd665fcae4581 (patch)
treeee9bd166d2cbc97374b99b22fe1cabc8a7eaba5f /ppc/sha1ppc.S
parentgit-stash: do not remove a ref by hand. (diff)
downloadtgif-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 'ppc/sha1ppc.S')
0 files changed, 0 insertions, 0 deletions