From: Ferry Huberts (Pelagic) <ferry.huberts@pelagic.nl>
Date: Sun, 12 Apr 2009 07:04:02 GMT
Subject: Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git
Message-ID: <49E19262.7090802@pelagic.nl>
In-Reply-To: <7v4owvdju6.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote:
> "Ferry Huberts (Pelagic)" <ferry.huberts@pelagic.nl> writes:
> 
>> Ferry Huberts (Pelagic) wrote:
>>> Junio C Hamano wrote:
>>>> Ferry Huberts <ferry.huberts@pelagic.nl> writes:
>>>>
>>>>> In several places merge.keepBackup is used i.s.o.
>>>>> mergetool.keepBackup. This patch makes it all
>>>>> consistent for git
>>>> A silly question.  The above makes it sound as if both merge.keepBackup
>>>> and mergetool.keepBackup are valid, but the latter is preferred, and your
>>>> patch makes things consistent even though without it there is nothing
>>>> broken per-se.
>>>>
>>>> Is that really is the case?
>>>>
>>>> Otherwise, perhaps the title and the message should read like this:
>>>>
>>>>     Fix misspelled mergetool.keepBackup
>>>>     
>>>>     In several places mergetool.keepBackup was misspelled as merge.keepBackup.
>>>>     
>>>>     Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
>>> feel free to change it :-)
> 
> Notice that I didn't follow the discussion closely, and I am asking if
> this is a "bugfix" or "changing for consistency even though there is no
> breakage".
> 

it's the latter.
summary: docs say mergetool.keepBackup. code does merge.keepBackup