Merge branch 'js/rebase-i-reword-to-run-hooks' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 21:24:28 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 21:24:29 +0000 (14:24 -0700)
commitd23d60f63d1ce2c9e91ecc0edd59652e516a4a37
tree530153ba0fd4259aca736372394d7bc87be8576d
parent16ad6048288fcb2baa8c48dd0e20987a1112241e
parentb92ff6e81429c6a2636b4d6d26ab9ce5d4890fe8
Merge branch 'js/rebase-i-reword-to-run-hooks' into next

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