I have a repo I added a gitattributes to it and was working on it fine. I sync it via dropbox to another machine. When I opened it to the other machine a bunch
gitattributes
Have you tried this?
git add -u . git reset