Having CRLF files in the repository with eol=crlf breaks just about everything, e.g. any rebase/merge involving these files would fail. Try to fix this by making sure the files use LF in the repository and CRLF is only used in the working copy.