Re: commit-msg hook does not run on merge with --no-ff option

2017-09-20 Thread Joseph Dunne
--amend -C HEAD On Fri, Sep 15, 2017 at 3:53 PM, Junio C Hamano wrote: > Joseph Dunne writes: > >> Valid point. The way my project is set up I always get a conflict on >> merge operations, so technically all my merges (except fast forward >> merges) end with a git-commit,

Re: commit-msg hook does not run on merge with --no-ff option

2017-09-15 Thread Joseph Dunne
. It seems I have no choice but to work around this issue. Thanks for your help. On Thu, Sep 14, 2017 at 8:50 PM, Kaartic Sivaraam wrote: > On Tue, 2017-09-12 at 13:24 -0500, Joseph Dunne wrote: >> Sorry I don't understand your question. The commit-msg hook runs >> properly i

Re: commit-msg hook does not run on merge with --no-ff option

2017-09-12 Thread Joseph Dunne
Sorry I don't understand your question. The commit-msg hook runs properly in all cases except when I perform a merge with the --no-ff option enabled. On Mon, Sep 11, 2017 at 12:25 PM, Stefan Beller wrote: > On Mon, Sep 11, 2017 at 7:34 AM, Joseph Dunne wrote: > >> When I mer

commit-msg hook does not run on merge with --no-ff option

2017-09-11 Thread Joseph Dunne
I’ve globally configured git master branch to use the –no-ff option in my .gitconfig file: [branch "master"] mergeoptions = “-–no-ff” When I merge a branch into master that would normally be a fast forward merge, the merge happens fine and follows the option –no-ff, creating a new