Merge branch 'aw/rebase-i-stop-on-failure-to-amend'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:37 +0000 (22:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:37 +0000 (22:33 -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