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)
commit4b945eea4098841a1d6ddb0884673b555cfdaab9
tree54ad4a2cca1b85dbf73aad794d4da03a10bb7466
parent3e8ff5e4f3fb0796b757730a9d64e848885d91c5
parentb92ff6e81429c6a2636b4d6d26ab9ce5d4890fe8
Merge branch 'js/rebase-i-reword-to-run-hooks'

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
sequencer.c