git.99rst.org Git - git.git/commit

author	Johannes Schindelin <redacted>
	Tue, 24 Jul 2007 20:43:09 +0000 (21:43 +0100)
committer	Junio C Hamano <redacted>
	Fri, 27 Jul 2007 17:59:42 +0000 (10:59 -0700)
commit	fb47cfbd59b12ea67e1a5c6a9d0bd665fcae4581
tree	ee9bd166d2cbc97374b99b22fe1cabc8a7eaba5f	tree \| snapshot
parent	7ab3cc70a6aad2e4f8ccaa98e5520aa126eaef8f	commit \| diff

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

git-rebase--interactive.sh		diff \| blob \| history
t/t3404-rebase-interactive.sh		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT