diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-23 08:29:06 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-23 08:29:06 (GMT) |
| commit | 735845efe4f743ec50ea92a38f33ee1f365685d2 (patch) | |
| tree | 3f987b87df86980c2fec1584ab5c24d7cea2da71 /.gitattributes | |
| parent | f1d0d7967e78856e7cb13e4b48f13fe49f93d07b (diff) | |
| download | tcl-735845efe4f743ec50ea92a38f33ee1f365685d2.zip tcl-735845efe4f743ec50ea92a38f33ee1f365685d2.tar.gz tcl-735845efe4f743ec50ea92a38f33ee1f365685d2.tar.bz2 | |
Attempt to fix [3947fcf7]: Current .gitattributes settings might not allow switching branches
Diffstat (limited to '.gitattributes')
| -rwxr-xr-x | .gitattributes | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 82bed50..420e405 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 |