builtin/merge: honor commit-msg hook for merges
authorStefan Beller <sbeller@google.com>
Thu, 7 Sep 2017 22:04:29 +0000 (15:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Sep 2017 00:52:11 +0000 (09:52 +0900)
commitf8b8635...8c991a5441d97e5dc59af8968ea37e37
tree3671368...723a754fc8bcd2bdd7d92115c29b985ccopy hash to clipboard (tree)
parent3ec7d70...a89c647ddf42a59bc3539361367de9d5copy hash to clipboard (diff)
builtin/merge.c
t/t7504-commit-msg-hook.sh