diff --git a/.gitattributes b/.gitattributes index b9619ee..81b9a0a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,36 +1,38 @@ # https://git-scm.com/docs/gitattributes +# We find that using this file may cause problem between different branches +# Therefore, all are commented. # Set the default behavior, in case people don't have core.autocrlf set. -* text=auto -*.txt text -*.vcproj text eol=crlf -*.sh text eol=lf -*.py eol=lf -*.c text eol=lf -*.h text eol=lf -*.cpp text eol=lf -*.cu text eol=lf -*.md text eol=lf -*.nt text eol=lf -*.sql text eol=lf +#* text=auto +#*.txt text +#*.vcproj text eol=crlf +#*.sh text eol=lf +#*.py eol=lf +#*.c text eol=lf +#*.h text eol=lf +#*.cpp text eol=lf +#*.cu text eol=lf +#*.md text eol=lf +#*.nt text eol=lf +#*.sql text eol=lf #*.jpg -text # Explicitly declare text files you want to always be normalized and converted # to native line endings on checkout. #*.c text #*.h text -*.md text -*.js text -*.json text -*.wxss text -*.wxml text +#*.md text +#*.js text +#*.json text +#*.wxss text +#*.wxml text # Declare files that will always have CRLF line endings on checkout. #*.sln text eol=crlf # Denote all files that are truly binary and should not be modified. -*.png binary -*.jpg binary +#*.png binary +#*.jpg binary # Below denotes which file to use git-lfs, large files #*.zip filter=lfs diff=lfs merge=lfs -text