Code

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)
commitd9d73b37f34e2e366357b99a6ac74a09681b0ab8
tree5f6df5ac64b69066b5b32cad9e6c6e77e5335052
parent4df989f9537cc9f168e96da7700f012b6367c63f
parent0becb3e4b94f19358f66ec2f4bbbf89904251bf5
Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint

* aw/rebase-i-stop-on-failure-to-amend:
  rebase -i: interrupt rebase when "commit --amend" failed during "reword"
git-rebase--interactive.sh