git-merge: honor pre-merge-commit hook
authorMichael J Gruber <git@drmicha.warpmail.net>
Wed, 7 Aug 2019 18:57:07 +0000 (11:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Aug 2019 19:37:33 +0000 (12:37 -0700)
commit6098817...d7f64209664c701df30096dc0f4fb876
treebda0487...baa09b8f8f53021784ce2087bd348914copy hash to clipboard (tree)
parenta1f3dd7...b303d924f90da30808f7702869430321copy hash to clipboard (diff)
Documentation/githooks.txt
builtin/merge.c
t/t7503-pre-commit-and-pre-merge-commit-hooks.sh [new file with mode: 0755]
t/t7503-pre-commit-hook.sh [deleted file]
templates/hooks--pre-merge-commit.sample [new file with mode: 0755]