I wondered what happened if i mix git on linux with windows. Anyways i made a commit (“first”) on linux, then modified a file on windows and committed there. It wouldnt let me because the end of line and patch seemed suspicious. So i tried from linux and it didnt allow me either…
I did git reset --hard. The files look like they have been resetted. However when i do git status it shows them all as modified. git commit -a -m "test" gets me the same problem. Git status shows them all modified. However git clone . creates a subdirectory and when i go there and write git status none of them are showed modified.
Even if its a timestamp problem why cant i recommit it and whats with the errors? Right now the simple solution would to move the current directory out and do a fresh clone on it. But i’d like to understand the problem going on.
I’m not sure if this exactly answers your question, but I’m using git (with svn as a backend, hosted on linux) on windows, and my colleagues are using git on a mac. I’m using git Extensions as my windows git client, and it tells me when it is altering the default line endings added by windows. We haven’t encountered any conflicts concerning line endings at all. In “Global settings” and “Local settings” I haven’t specified anthing about how to handle line endings, so it looks as though the default behaviour is taking care of it all.