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
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Date
Jul 1, 2010, 20:25 UTC
Message-ID
<531FFACB-CBEA-4BC6-B831-CC7C6F954DB5@gmail.com>
In-Reply-To
<m3aaqbnemz.fsf@localhost.localdomain>
On 1. juli 2010, at 22.15, Jakub Narebski wrote:
Show 9 quoted lines
> Finn Arne Gangstad <finnag@pvv.org> writes:
>> On Thu, Jul 01, 2010 at 10:05:17AM -0700, Jakub Narebski wrote:
>>> 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...
Almost, it's about converting to the _repository_ version according to current (that is, merged) settings.  Since the content is already in repository format it needs to be converted to the worktree version before it is converted back, hence Junio's "doubleConvert".
"merge.renormalizeUsingMergedGitattributes"?
-- 
Eyvind
Previous: Jakub NarebskiNext: Eyvind Bernhardsen
Message 10 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.