From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Sep 2019 18:50:08 +0000 (-0700)
Subject: Merge branch 'js/pre-merge-commit-hook'
X-Git-Tag: v2.24.0-rc0~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f76bd8c6b132bdcefd547cb99cb832f433fee544;p=thirdparty%2Fgit.git

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

f76bd8c6b132bdcefd547cb99cb832f433fee544