summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-26 14:07:03 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-08-26 14:07:03 (GMT)
commitbf62089e129be0a5a41d20eb86b8f73c9829f7a3 (patch)
treec7654ef97f7152b5d74f0ad2f313882c2b865c71
parentbf10d7f187b5017773f1342994469a1bd4e0e8f7 (diff)
parent3718091236ee12146de730e2d5d733a3ee6ce77f (diff)
downloadtcl-bf62089e129be0a5a41d20eb86b8f73c9829f7a3.zip
tcl-bf62089e129be0a5a41d20eb86b8f73c9829f7a3.tar.gz
tcl-bf62089e129be0a5a41d20eb86b8f73c9829f7a3.tar.bz2
Merge 8.6
-rwxr-xr-x.gitattributes9
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
index 42dc060..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,9 +21,9 @@
*.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