From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Mar 2017 21:07:17 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-reword-to-run-hooks'
X-Git-Tag: v2.13.0-rc0~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b945eea4098841a1d6ddb0884673b555cfdaab9;p=thirdparty%2Fgit.git

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
---

4b945eea4098841a1d6ddb0884673b555cfdaab9