[git-users] .gitattributes eol=crlf behavior

2014-05-28 Thread Richard Smith
We have some source files that are shared among windows/linux/macos. One of the IDE's (Keil ARM) doesn't have a setting to use LF as a eol. It preserves the original eol when the file is mixed eol but any line that you change ends up CRLF. We found the best solution for our workflow was to d

Re: [git-users] .gitattributes eol=crlf behavior

2014-05-28 Thread Philip Oakley
- Original Message - From: Richard Smith To: git-users@googlegroups.com Sent: Wednesday, May 28, 2014 4:49 PM Subject: [git-users] .gitattributes eol=crlf behavior We have some source files that are shared among windows/linux/macos. One of the IDE's (Keil ARM) doesn't have

Re: [git-users] .gitattributes eol=crlf behavior

2014-05-28 Thread Richard Smith
On Wednesday, May 28, 2014 3:13:22 PM UTC-4, Philip Oakley wrote: > > Any idea what git diff is thinking is different or some suggestions on how > to find out? Its not obvious from the diff output. If I use difftool > kdiff3 reports the files are binary equal. > > > The EOL normalisation

Re: [git-users] .gitattributes eol=crlf behavior

2014-05-28 Thread Richard Smith
> > This is the same sort of issue we had with autocrlf. The docs seem to > suggest that .gitattributes setup would let you have files stored int the > repository as crlf but perhaps I just misunderstand. Am I doing something > wrong or is git going to always put lf in the repository when lin