]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
"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

1  2 
git-rebase--interactive.sh

Simple merge