[Mono-dev] Git line-ending issues

Stifu stifu at free.fr
Thu Jan 6 14:02:35 EST 2011


Hi guys,

I'm having issues with a commit I did (d'oh :(), and would like help to
clean up my mess.
The commit can be seen here:
https://github.com/mono/mono/commit/4d5451a61ce63769083ebad3b1a5d9055a27b6df

I only removed a few lines in the file, but the whole file shows up as
changed. From what I understand, this is due to a difference in line-ending
encoding.
Looking at the .gitattributes file in the same folder, I see certain files
(including the one I modified) are specified as having a certain line-ending
encoding (CRLF).

1- What is the best way to fix my problem? Simply remove the concerned line
from the .gitattributes file, or remodify the file I changed?

2- In general, should we use CRLF or not? Do we want to gradually homogenize
things and apply the same logic for all files, and if so, what type of line
ending should we use? Or should we leave everything as is?

Thanks in advance, and sorry for being a noob.
-- 
View this message in context: http://mono.1490590.n4.nabble.com/Git-line-ending-issues-tp3177991p3177991.html
Sent from the Mono - Dev mailing list archive at Nabble.com.


More information about the Mono-devel-list mailing list