diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-26 14:05:32 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-26 14:05:32 (GMT) |
commit | 3718091236ee12146de730e2d5d733a3ee6ce77f (patch) | |
tree | 7b1b7abeff78ccb336c86eaefc29d113e4846104 | |
parent | 820f8b93db0118a857d692bea2efa8b3b3149692 (diff) | |
parent | 46e7a572e2611f062a48a5cf3b8fa87b5ba43172 (diff) | |
download | tcl-3718091236ee12146de730e2d5d733a3ee6ce77f.zip tcl-3718091236ee12146de730e2d5d733a3ee6ce77f.tar.gz tcl-3718091236ee12146de730e2d5d733a3ee6ce77f.tar.bz2 |
Fix [3947fcf7]: Current .gitattributes settings might not allow switching branches
-rwxr-xr-x | .gitattributes | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 82bed50..e9a67c8 100755 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ # Set the default behavior, in case people don't have core.autocrlf set. -* text eol=lf +* eol=lf +* text=auto # Explicitly declare text files you want to always be normalized and converted # to native line endings on checkout. @@ -20,15 +21,16 @@ *.test text # Declare files that will always have CRLF line endings on checkout. -*.bat text eol=crlf -*.sln text eol=crlf -*.vc text eol=crlf +*.bat eol=crlf +*.sln eol=crlf +*.vc eol=crlf # Denote all files that are truly binary and should not be modified. *.a binary *.dll binary *.exe binary *.gif binary +*.gz binary *.jpg binary *.lib binary *.pdf binary |