summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2020-12-10 23:30:52 -0500
committerKurausukun <lord.uber1@gmail.com>2020-12-10 23:30:52 -0500
commit58976ebaa8d73d174940f622ec36f22bcd2fd8a2 (patch)
treec27ab24ed83fdb16654b5814d681af487b119601 /.gitattributes
parent32ae13f9b66ab1b01146e5746e9350f97f055526 (diff)
parent8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (diff)
Merge remote-tracking branch 'upstream/master' into berry_crush
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 4e8417c0c..1f2aa0c6d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,6 +10,14 @@ Makefile text eol=lf
*.inc text eol=lf
*.sha1 text eol=lf
*.json text eol=lf
+*.sed text eol=lf
+*.cpp text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+*.hpp text eol=lf
+*.md text eol=lf
+*.ps1 text eol=crlf
+*.yml text eol=lf
*.png binary
*.bin binary