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

2012-09-06 Thread Michael Haggerty
On 09/06/2012 10:16 AM, Michael J Gruber wrote: > Michael Haggerty venit, vidit, dixit 05.09.2012 17:30: >> On 09/05/2012 03:39 PM, Michael J Gruber wrote: >>> git-merge does not honor the pre-commit hook when doing automatic merge >>> commits, and for compatibility reasons this is going to stay. >

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

2012-09-06 Thread Michael J Gruber
Michael Haggerty venit, vidit, dixit 05.09.2012 17:30: > On 09/05/2012 03:39 PM, Michael J Gruber wrote: >> 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 a

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

2012-09-05 Thread Michael Haggerty
On 09/05/2012 03:39 PM, Michael J Gruber wrote: > 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 fo

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

2012-09-05 Thread 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 (or any other commit). Sig