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

Re: What's cooking in git.git (Jul 2010, #01; Wed, 7)

From
Finn Arne Gangstad <finnag@pvv.org>
Date
Jul 8, 2010, 12:27 UTC
Message-ID
<20100708122716.GA2193@pvv.org>
In-Reply-To
<7vlj9msve4.fsf@alter.siamese.dyndns.org>
On Wed, Jul 07, 2010 at 04:51:47PM -0700, Junio C Hamano wrote:
> * eb/double-convert-before-merge (2010-07-02) 3 commits
>  - Don't expand CRLFs when normalizing text during merge
>  - Try normalizing files to avoid delete/modify conflicts when merging
>  - Avoid conflicts when merging branches with mixed normalization

Any hopes of getting this in soonish? Since this now is "opt-in", and helps tremendously if you are adding the new text/eol attributes, it would be helpful to see it in the same release as the new attributes.

- Finn Arne
Previous: Ævar Arnfjörð Bjarmason
Message 3 of 3 in “What's cooking in git.git (Jul 2010, #01; Wed, 7)”
  1. Junio C HamanoJul 7, 2010
  2. Ævar Arnfjörð BjarmasonJul 8, 2010
  3. Finn Arne GangstadJul 8, 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.