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

--amend -C HEAD On Fri, Sep 15, 2017 at 3:53 PM, Junio C Hamano <gits...@pobox.com> wrote: > Joseph Dunne <jdunne...@gmail.com> writes: > >> Valid point. The way my project is set up I always get a conflict on >> merge operations, so technically all my merges (exce

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

. 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 <kaarticsivaraam91...@gmail.com> wrote: > On Tue, 2017-09-12 at 13:24 -0500, Joseph Dunne wrote: >> Sorry I don't understand your question. The commi

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

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 <sbel...@google.com> wrote: > On Mon, Sep 11, 2017 at 7:34 AM, Joseph Dunne <jdunne.

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

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