Merge branch 'mm/rebase-i-post-rewrite-exec' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:09 +0000 (11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:09 +0000 (11:02 -0700)
commitf249409b6be74132e80e6d83f264aaa158563be1
tree54dc338a17ec14a4f79fdbf72947253eca1ee7cd
parentf09bd215cde5e30029fe08f309d0554eb9256778
parent141ff8f9e7a235ab279329ba348e3d88fca4fdab
Merge branch 'mm/rebase-i-post-rewrite-exec' into maint

"git rebase -i" fired post-rewrite hook when it shouldn't (namely,
when it was told to stop sequencing with 'exec' insn).

* mm/rebase-i-post-rewrite-exec:
  t5407: use <<- to align the expected output
  rebase -i: fix post-rewrite hook with failed exec command
  rebase -i: demonstrate incorrect behavior of post-rewrite
git-rebase--interactive.sh