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

2019-07-29 Thread Martin Ă…gren
On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote: > --- /dev/null > +++ b/templates/hooks--pre-merge.sample > @@ -0,0 +1,13 @@ > +#!/bin/sh > +# > +# An example hook script to verify what is about to be committed. > +# Called by "git merge" with no arguments. The hook should > +# exit with non-z

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

2019-07-18 Thread Josh Steadmon
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