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

Re: core.autocrlf and merge conflict output

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 23, 2008, 01:54 UTC
Message-ID
<7vk5ggkjan.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<g3mvbh$mmj$1@ger.gmane.org>
"Edward Z. Yang" <edwardzyang@thewritingpot.com> writes:
Show 7 quoted lines
> Junio C Hamano wrote:
>> Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
>> when writing out the result, 2008-06-09) happened?
>
> Apparently, yes. :o) Thus are the perils of working off a "downstream"
> branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this
> change merged in. Thanks!
Did cherry-picking that particular commit locally fixes the issue for you?
Previous: Edward Z. YangNext: Johannes Schindelin
Message 4 of 6 in “core.autocrlf and merge conflict output”
  1. Edward Z. YangJun 22, 2008
  2. Junio C HamanoJun 23, 2008
  3. Edward Z. YangJun 23, 2008
  4. Junio C HamanoJun 23, 2008
  5. Johannes SchindelinJun 23, 2008
  6. Edward Z. YangJun 23, 2008

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.