git attributes to simplify comparison with existing imported data

ypapouin · Oct 16, 2019 · cc0a269 · cc0a269
1 parent 24e911c
commit cc0a269
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,16 @@
+## Unity ##
+
+*.cs diff=csharp text eol=crlf
+*.cginc text
+*.shader text
+
+
+*.mat merge=unityyamlmerge eol=lf
+*.anim merge=unityyamlmerge eol=lf
+*.unity merge=unityyamlmerge eol=lf
+*.prefab merge=unityyamlmerge eol=lf
+*.physicsMaterial2D merge=unityyamlmerge eol=lf
+*.physicsMaterial merge=unityyamlmerge eol=lf
+*.asset merge=unityyamlmerge eol=lf
+*.meta merge=unityyamlmerge eol=lf
+*.controller merge=unityyamlmerge eol=lf