diff options
| author | jc0b <j@jc0b.computer> | 2020-07-21 21:22:44 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:48:14 +0200 |
| commit | 67b6ec800df8e023efadb60ae5f7919030b19789 (patch) | |
| tree | 9aa496408a4097857b6a032b84dd0a396321e1d3 /.gitattributes | |
| parent | 5b4ab37ac7be2b2c34e2fad928b0cd7f3a837263 (diff) | |
| parent | 04686bf5cef4aea51fd613a158aa8b155763d0e7 (diff) | |
Merge branch 'master' onto local working copy
Preserve working copy while updating
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 526c8a38..9d6ef431 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,5 @@ -*.sh text eol=lf
\ No newline at end of file +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf +*.sh text eol=lf |