From 6d808c4272b3abc167f990848559fe3972f9fae2 Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Sun, 2 Dec 2018 06:36:00 +0100
Subject: [PATCH] git: More ignored files and merge/diff attributes for binary
 files

---
 .gitattributes | 7 +++++++
 .gitignore     | 7 +++----
 2 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..bdfb387
--- /dev/null
+++ b/.gitattributes
@@ -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
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d25525d..ba88eee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-Pack.gma
-Changelog.txt
-Description.txt
-/*.gma
+/media/rendered/*
+*.gma
+desktop.ini
\ No newline at end of file