git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Finn Arne Gangstad <finnag@pvv.org>
Date
Jul 1, 2010, 18:57 UTC
Message-ID
<20100701185712.GA22421@pvv.org>
In-Reply-To
<m3iq4znnfr.fsf@localhost.localdomain>
On Thu, Jul 01, 2010 at 10:05:17AM -0700, Jakub Narebski wrote:
Show 19 quoted lines
> 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 :)
- Finn Arne
Previous: Jakub NarebskiNext: Jakub Narebski
Message 8 of 13 in “Re-rolled merge normalization”
  1. 0/4 Re-rolled merge normalizationEyvind Bernhardsen, Jul 1, 2010
  2. 1/4 Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen, Jul 1, 2010
  3. 2/4 Introduce "double conversion during merge" more graduallyEyvind Bernhardsen, Jul 1, 2010
  4. Johannes SixtJul 1, 2010
  5. Junio C HamanoJul 1, 2010
  6. Eyvind BernhardsenJul 1, 2010
  7. Jakub NarebskiJul 1, 2010
  8. Finn Arne GangstadJul 1, 2010
  9. Jakub NarebskiJul 1, 2010
  10. Eyvind BernhardsenJul 1, 2010
  11. Eyvind BernhardsenJul 1, 2010
  12. 3/4 Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen, Jul 1, 2010
  13. 4/4 Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen, Jul 1, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.