Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:34 +0000 (11:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:34 +0000 (11:32 -0800)
* aw/rebase-i-stop-on-failure-to-amend:
rebase -i: interrupt rebase when "commit --amend" failed during "reword"

1  2 
git-rebase--interactive.sh
Simple merge