From: John Szakmeister <john@szakmeister.net>
Date: Wed, 04 May 2011 10:58:08 GMT
Subject: Re: [PATCH v4] Add default merge options for all branches
Message-ID: <BANLkTin0Mi0sOWR5_mYnONW816cVoaXtbA@mail.gmail.com>
In-Reply-To: <7vzkn3f5wo.fsf@alter.siamese.dyndns.org>

On Wed, May 4, 2011 at 12:25 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Jonathan Nieder <jrnieder@gmail.com> writes:
>>
>>> I'm starting to suspect it might be simpler to add a new "[merge] no-ff"
>>> configuration item, like the existing "[merge] log".
>>
>> Surely
>>
>>       [merge]
>>               log = false
>>               ff = false
>>
>> would be a lot simpler and probably far easier to explain.
>
> Yes, it is far simpler and easier to explain.  I'll leave the tests and
> the commit log message to people who are more interested in this topic
> than I am ;-)

I like the idea.  I assume it can be overridden on the command line too?

-John