Merge branch 'js/rebase-i-reword-to-run-hooks'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:17 +0000 (14:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:17 +0000 (14:07 -0700)
A recent update to "rebase -i" stopped running hooks for the "git
commit" command during "reword" action, which has been fixed.

* js/rebase-i-reword-to-run-hooks:
sequencer: allow the commit-msg hooks to run during a `reword`
sequencer: make commit options more extensible
t7504: document regression: reword no longer calls commit-msg

1  2 
sequencer.c
diff --cc sequencer.c
Simple merge