Subject: Re: [PATCH v5 2/4] Introduce "double conversion during merge" more gradually

From: Jakub Narebski <[email-masked]>
Date: Thu, 01 Jul 2010 13:15:28 -0700 (PDT)

Finn Arne Gangstad <[email-masked]> writes:
> On Thu, Jul 01, 2010 at 10:05:17AM -0700, Jakub Narebski wrote:
>> Eyvind Bernhardsen <[email-masked]> writes:
>>> On 1. juli 2010, at 18:25, Junio C Hamano <[email-masked]> wrote:
>>>> Johannes Sixt <[email-masked]> writes:
>>>>> Am 7/1/2010 11:09, schrieb Eyvind Bernhardsen:
>>>>>
>>>>>> +core.mergePrefilter::
>> [...]
>>>> 
>>>> Somehow to me "prefilter" does not sound to convey what really is going on
>>>> here, though.
>>> 
>>> "Doubleconvert" doesn't really mean anything either though, and
>>> "convert" and "normalise" are too generic. I think the problem is
>>> that there's no existing name for what convert.c does.
>>> 
>>> I chose "filter" because of the filter property; the crlf and ident
>>> things can be regarded as built-in filters.  -- Eyvind
>> 
>> What about `merge.renormalize' ;-) ?
> 
> Best so far! Or what about "merge.canonicalize"? Sorry for bikeshedding :)

Perhaps `merge.regularize'?  Or `merge.normalizeToWorkTree'?
It is about converting to worktree version according to current
settings, IIUC...

-- 
Jakub Narebski
Poland
ShadeHawk on #git