After doing git difftool --dir-diff, my workspace files are modified for some reason. I've been guessing that it's converting the line endings between crlf and lf etc... However, doing "git config core.autocrlf false" or "git config --global core.autocrlf false" don't make any difference. I have tried using both windiff and beyond compare as the custom diff tool but it doesn't help. This is bad since every time I view some changes in my .csproj file, the project is reloaded since it said the file has been modified externally. Any ideas?
Asked
Active
Viewed 241 times
2
tenorsax
- 21,123
- 9
- 60
- 107
user1715925
- 607
- 9
- 26
1 Answers
0
The only other way an automatic conversion can be declared is through .gitattributes file (see gitattributes):
- with directives like
*.txt eol=lf("Git: Default all text files to unix line breaks") or* text=auto("Force LF eol in git repo and working copy") - with content filter (smudge script)
-
Other than that, check if the issue persists when you are making a diff on *another* clone of your repo. Or on a clone of your repo on *another* workstation. – VonC Oct 03 '12 at 06:20
-
I didn't see any .gitattributes file anywhere so I created one in the directory of my project and added `* -text` to disable LF normalization but it didn't work. By the way, I'm using Git Shell that's included from GitHub for Windows instead of Git. This behavior is the same for all the other clones, it still seems to be editing the files somehow. I have again made sure to turn off all `core.autocrlf` settings with both `--system` and `--global` flags. Any ideas? @VonC – user1715925 Oct 07 '12 at 23:02
-
Want to make another note that if all my changes are added to staging area then it seems to no longer modify my files. – user1715925 Oct 23 '12 at 17:16