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

Re: core.autocrlf and merge conflict output

From
Edward Z. Yang <edwardzyang@thewritingpot.com>
Date
Jun 23, 2008, 02:23 UTC
Message-ID
<485F093F.8020300@thewritingpot.com>
In-Reply-To
<alpine.DEB.1.00.0806230259140.6439@racer>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Johannes Schindelin wrote:
> Funny.  And I thought 1.5.6 contained that patch...  Because 1.5.6 was 
> merged by Steffen recently, and announced on both the msysgit list as well 
> as this one.

And I'm wrong once again. My git checkout was on a detached head and wasn't updating (apparently, I'm no good at reading error messages). Switching back to master, pulling and then re-compiling fixed it.

While 99% of this is my fault, there might be a bug in netinstall.
However, I'm going to take that one to the msysgit list.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIXwk/qTO+fYacSNoRAkIhAJ9LU6jH5ThQbu0tSjmkbp7ynEyh5wCdHvbJ pFVPllbiXjfLrgEYuY+uVlM= =ZxbH -----END PGP SIGNATURE-----

Previous: Johannes Schindelin
Message 6 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.