Re: [PATCH 0/4] pre-merge hook

2017-10-16 Thread Junio C Hamano
Michael J Gruber writes: > This series revives an old suggestion of mine to make merge honor > pre-commit hook or a separate pre-merge hook This seems to have become an abandoned loose end, so I'll drop the topic from my tree for now; revival of the discussion is _not_

Re: [PATCH 0/4] pre-merge hook

2017-10-02 Thread Stefan Beller
On Sun, Oct 1, 2017 at 10:54 PM, Junio C Hamano wrote: > Michael J Gruber writes: > >> Now that f8b863598c ("builtin/merge: honor commit-msg hook for merges", >> 2017-09-07) has landed, merge is getting closer to behaving like commit, >> which is important

Re: [PATCH 0/4] pre-merge hook

2017-10-01 Thread Junio C Hamano
Michael J Gruber writes: > Now that f8b863598c ("builtin/merge: honor commit-msg hook for merges", > 2017-09-07) has landed, merge is getting closer to behaving like commit, > which is important because both are used to complete merges (automatic > vs. non-automatic). Just a

[PATCH 0/4] pre-merge hook

2017-09-22 Thread Michael J Gruber
Now that f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07) has landed, merge is getting closer to behaving like commit, which is important because both are used to complete merges (automatic vs. non-automatic). This series revives an old suggestion of mine to make merge