git: More ignored files and merge/diff attributes for binary files

2018-12-02 06:36:00 +01:00
parent a2b2c33475
commit 6d808c4272
2 changed files with 10 additions and 4 deletions
@@ -0,0 +1,7 @@
+*.jpg merge=binary -diff
+*.png merge=bianry -diff
+*.gif merge=binary -diff
+*.tiff merge=bianry -diff
+*.tga merge=binary -diff
+*.psd merge=binary -diff
+*.psb merge=binary -diff