Re: [PATCH v3 3/4] git-merge: honor pre-merge-commit hook

2019-08-02 Thread Josh Steadmon
On 2019.08.02 11:45, Martin Ågren wrote: > On Fri, 2 Aug 2019 at 00:20, Josh Steadmon wrote: > > > diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt > > index 82cd573776..7c4c994858 100644 > > --- a/Documentation/githooks.txt > > +++ b/Documentation/githooks.txt > > @@ -103,6 +

Re: [PATCH v3 3/4] git-merge: honor pre-merge-commit hook

2019-08-02 Thread Martin Ågren
On Fri, 2 Aug 2019 at 00:20, Josh Steadmon wrote: > diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt > index 82cd573776..7c4c994858 100644 > --- a/Documentation/githooks.txt > +++ b/Documentation/githooks.txt > @@ -103,6 +103,13 @@ The default 'pre-commit' hook, when enabled--

[PATCH v3 3/4] git-merge: honor pre-merge-commit hook

2019-08-01 Thread Josh Steadmon
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-commit 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