From: Jakub Narebski <jnareb@gmail.com>
To: Finn Arne Gangstad <finnag@pvv.org>
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Johannes Sixt <j.sixt@viscovery.net>,
"git@vger.kernel.orgList" <git@vger.kernel.org>
Subject: Re: [PATCH v5 2/4] Introduce "double conversion during merge" more gradually
Date: Thu, 01 Jul 2010 13:15:28 -0700 (PDT) [thread overview]
Message-ID: <m3aaqbnemz.fsf@localhost.localdomain> (raw)
In-Reply-To: <20100701185712.GA22421@pvv.org>
Finn Arne Gangstad <finnag@pvv.org> writes:
> On Thu, Jul 01, 2010 at 10:05:17AM -0700, Jakub Narebski wrote:
>> Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> writes:
>>> On 1. juli 2010, at 18:25, Junio C Hamano <gitster@pobox.com> wrote:
>>>> Johannes Sixt <j.sixt@viscovery.net> 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
next prev parent reply other threads:[~2010-07-01 20:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 9:09 [PATCH v5 0/4] Re-rolled merge normalization Eyvind Bernhardsen
2010-07-01 9:09 ` [PATCH v5 1/4] Avoid conflicts when merging branches with mixed normalization Eyvind Bernhardsen
2010-07-01 9:09 ` [PATCH v5 2/4] Introduce "double conversion during merge" more gradually Eyvind Bernhardsen
2010-07-01 10:19 ` Johannes Sixt
2010-07-01 16:25 ` Junio C Hamano
2010-07-01 16:41 ` Eyvind Bernhardsen
2010-07-01 17:05 ` Jakub Narebski
2010-07-01 18:57 ` Finn Arne Gangstad
2010-07-01 20:15 ` Jakub Narebski [this message]
2010-07-01 20:25 ` Eyvind Bernhardsen
2010-07-01 20:13 ` Eyvind Bernhardsen
2010-07-01 9:09 ` [PATCH v5 3/4] Try normalizing files to avoid delete/modify conflicts when merging Eyvind Bernhardsen
2010-07-01 9:09 ` [PATCH v5 4/4] Don't expand CRLFs when normalizing text during merge Eyvind Bernhardsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3aaqbnemz.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=finnag@pvv.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).