From: Philip Oakley <philipoakley@iee.org>
Date: Sat, 01 Jul 2017 18:40:52 GMT
Subject: Re: [PATCH] hooks: add signature to the top of the commit message
Message-ID: <54E752528FED4662912D8CC94B19513D@PhilipOakley>
In-Reply-To: <xmqqfuegnjnt.fsf@gitster.mtv.corp.google.com>

From: "Junio C Hamano" <gitster@pobox.com>
> Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> writes:
>
>>> By the way, the one that is still actually enabled is no longer
>>> needed.  The commit template generated internally was corrected some
>>> time ago not to add the "Conflicts:" section without commenting it
>>> out.
>>>
>> I'll send in another patch that removes it but it seems removing it
>> would leave sample hook without anything turned on by default. That
>> doesn't sound fine, does it?
>
> Actually I was wondering if it is a good idea to remove it, as it
> seems to have outlived its usefulness.

Personally, I like the comfort of seeing the Conflicts: list, but if others 
have indicated otherwise...
--
Philip