Re: [PATCH] builtin/merge: honor commit-msg hook for merges

2017-09-05 Thread Junio C Hamano
Stefan Beller writes: > Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14) > merge should also honor the commit-msg hook; the reason is the same as > in that commit: When a merge is stopped due to conflicts or --no-commit, > the subsequent commit calls

[PATCH] builtin/merge: honor commit-msg hook for merges

2017-09-05 Thread Stefan Beller
Similar to 65969d43d1 (merge: honor prepare-commit-msg hook, 2011-02-14) merge should also honor the commit-msg hook; the reason is the same as in that commit: When a merge is stopped due to conflicts or --no-commit, the subsequent commit calls the commit-msg hook. However, it is not called after