Re: [PATCH 1/4] git-merge: Honor pre-merge hook

2017-09-22 Thread Martin Ågren
On 22 September 2017 at 14:04, Michael J Gruber wrote: > From: Michael J Gruber > > git-merge does not honor the pre-commit hook when doing automatic merge > commits, and for compatibility reasons this is going to stay. > > Introduce a pre-merge hook which is called for an automatic merge commit

Re: [PATCH 1/4] git-merge: Honor pre-merge hook

2017-09-22 Thread Stefan Beller
On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber wrote: > From: Michael J Gruber > > git-merge does not honor the pre-commit hook when doing automatic merge > commits, and for compatibility reasons this is going to stay. > > Introduce a pre-merge hook which is called for an automatic merge commi

[PATCH 1/4] git-merge: Honor pre-merge hook

2017-09-22 Thread Michael J Gruber
From: Michael J Gruber git-merge does not honor the pre-commit hook when doing automatic merge commits, and for compatibility reasons this is going to stay. Introduce a pre-merge hook which is called for an automatic merge commit just like pre-commit is called for a non-automatic merge commit (o