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

git diff, git mergetool and CRLF conversion

From
HKHannu Koivisto <azure@iki.fi>
Date
Jan 21, 2009, 16:55 UTC
Message-ID
<83k58ofvjt.fsf@kalahari.s2.org>
Hi,

Suppose I have core.autocrlf set to true and and due to that a version controlled file in a working tree with CRLF line endings. If I modify such a file and then say "git diff", I get a patch with LF line endings.

Also, if get a merge conflict with a file to which CRLF conversion is applied and run e.g. "git mergetool -t emerge", the temporary files representing stage2 and stage3 versions seem to have LF line endings.

Is this intended behaviour?  I'm using 1.6.1 on Cygwin.
-- 
Hannu
Next: Charles Bailey
Message 1 of 12 in “git diff, git mergetool and CRLF conversion”
  1. Hannu KoivistoJan 21, 2009
  2. Charles BaileyJan 21, 2009
  3. Theodore TsoJan 21, 2009
  4. mergetool: respect autocrlf by using checkout-indexCharles Bailey, Jan 21, 2009
  5. Junio C HamanoJan 23, 2009
  6. Charles BaileyJan 23, 2009
  7. Hannu KoivistoJan 26, 2009
  8. Charles BaileyJan 26, 2009
  9. Junio C HamanoJan 26, 2009
  10. Junio C HamanoJan 26, 2009
  11. Junio C HamanoJan 26, 2009
  12. Hannu KoivistoJan 27, 2009

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.