summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-26 14:03:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-26 14:03:19 (GMT)
commit46e7a572e2611f062a48a5cf3b8fa87b5ba43172 (patch)
tree375d9e974302db4b7b0cf7441ed42c50bac97714 /.gitattributes
parent1637e28f70335fec7893a8dea29b33f7bb856658 (diff)
parent735845efe4f743ec50ea92a38f33ee1f365685d2 (diff)
downloadtcl-46e7a572e2611f062a48a5cf3b8fa87b5ba43172.zip
tcl-46e7a572e2611f062a48a5cf3b8fa87b5ba43172.tar.gz
tcl-46e7a572e2611f062a48a5cf3b8fa87b5ba43172.tar.bz2
Fix [3947fcf7]: Current .gitattributes settings might not allow switching branches
Diffstat (limited to '.gitattributes')
-rwxr-xr-x.gitattributes10
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