Merge branch 'js/pre-merge-commit-hook'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2019 18:50:08 +0000 (11:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2019 18:50:08 +0000 (11:50 -0700)
commitf76bd8c6b132bdcefd547cb99cb832f433fee544
tree7656d005aed1e24001a924ed48b02f90dc96262c
parenta2e524ecf396722020e85b39d7b5e83d7c95ec24
parentbc40ce4de612942e9a6a755f7432806ee095bd82
Merge branch 'js/pre-merge-commit-hook'

A new "pre-merge-commit" hook has been introduced.

* js/pre-merge-commit-hook:
  merge: --no-verify to bypass pre-merge-commit hook
  git-merge: honor pre-merge-commit hook
  merge: do no-verify like commit
  t7503: verify proper hook execution