From e9b69ca9c645a0b0c38fe21ef3daf8114f21336f Mon Sep 17 00:00:00 2001 From: Matt Scalzo Date: Thu, 30 Jan 2020 15:58:05 -0500 Subject: [PATCH] Add more attributes to lfs .gitattributes This should be what we are trying to do... --- .gitattributes | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/.gitattributes b/.gitattributes index 163db793..35e9657e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,116 @@ +## Unity ## + +*.cs diff=csharp text +*.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 +*.physicMaterial2D merge=unityyamlmerge eol=lf +*.physicsMaterial merge=unityyamlmerge eol=lf +*.physicMaterial merge=unityyamlmerge eol=lf +*.asset merge=unityyamlmerge eol=lf +*.meta merge=unityyamlmerge eol=lf +*.controller merge=unityyamlmerge eol=lf + +* text=auto +# Text files +*.cs diff=csharp text +*.txt text +*.mat text +*.shader text +*.meta text +*.md5 text +*.compute text +*.md text +*.prefab text +*.mixer text +*.ShaderGraph text +*.anim text +*.asmdef text +*.json text +*.overrideController text +*.cginc text +*.hlsl text +*.giparams text +*.controller text +*.mask text +*.playable text + + +## git-lfs ## + +ProjectSettings/*.asset text +# Binaries +**/Assets/**/*.png filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.tif filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.TIF filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.tiff filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.tga filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.fbx filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.FBX filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.ttf filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.dll filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.bundle filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.so filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.zip filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.exr filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.hdr filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.ma filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.mp3 filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.ogg filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.obj filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.OBJ filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.TGA filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.mdb filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.pdf filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.asset filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.bytes filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.aif filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.bmp filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.pdt filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.psd filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.sbsar filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.unity filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.entities filter=lfs diff=lfs merge=lfs -text +**/Assets/**/*.wav filter=lfs diff=lfs merge=lfs -text + +#Image +*.jpg filter=lfs diff=lfs merge=lfs -text +*.jpeg filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text *.psd filter=lfs diff=lfs merge=lfs -text +*.ai filter=lfs diff=lfs merge=lfs -text + +#Audio +*.mp3 filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +*.ogg filter=lfs diff=lfs merge=lfs -text + +#Video +*.mp4 filter=lfs diff=lfs merge=lfs -text +*.mov filter=lfs diff=lfs merge=lfs -text + +#3D Object +*.FBX filter=lfs diff=lfs merge=lfs -text +*.fbx filter=lfs diff=lfs merge=lfs -text +*.blend filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text + +#ETC +*.a filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text +*.unitypackage filter=lfs diff=lfs merge=lfs -text +*.aif filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.rns filter=lfs diff=lfs merge=lfs -text +*.reason filter=lfs diff=lfs merge=lfs -text +*.lxo filter=lfs diff=lfs merge=lfs -text \ No newline at end of file