On Thu, Jan 6, 2011 at 2:02 PM, Stifu <st...@free.fr> wrote: > > 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).
The .gitattributes format is rather unintuitive. "crlf" means the file is stored as lf in the repo, but converted to/from crlf on windows. "-crlf" explicitly disables conversions, in case the user has autoconversion enabled for all files. Are you perhaps using a git tools that ignores these attributes? -- Michael Hutchinson http://mjhutchinson.com _______________________________________________ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list