]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2e524e bc40ce4)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.