From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Sep 2019 16:23:37 +0000 (-0700)
Subject: Merge branch 'js/pre-merge-commit-hook' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c9f25399c8b94980009aa939269356f1774c533;p=git

Merge branch 'js/pre-merge-commit-hook' into next

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

0c9f25399c8b94980009aa939269356f1774c533