Re: [PATCH 2/4] merge: do no-verify like commit

2017-09-22 Thread Stefan Beller
On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber wrote: > f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07) > introduced the no-verify to merge for bypassing the commit-msg hook, > though in a different way from the implementation in commit.c. > > Change the implementatio

[PATCH 2/4] merge: do no-verify like commit

2017-09-22 Thread Michael J Gruber
f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07) introduced the no-verify to merge for bypassing the commit-msg hook, though in a different way from the implementation in commit.c. Change the implementation in merge.c to be the same as in merge.c so that both do the same