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
@@ -1,4 +1,3 @@
-Pack.gma
-Changelog.txt
-Description.txt
-/*.gma
+/media/rendered/*
+*.gma
+desktop.ini