Add gitconfig

gitconfig

@@ -0,0 +1,18 @@
+# This is Git's per-user configuration file.
+[user]
+# Please adapt and uncomment the following lines:
+#	name = Kevin Heinicke
+#	email = kheinicke@kheinick-mbp2.dyndns.cern.ch
+[user]
+	email = kevin@kehei.de
+	name = Kevin Heinicke
+[core]
+	excludesfile = /Users/kheinicke/.gitignore_global
+[diff]
+	tool = opendiff
+[difftool]
+	prompt = false
+[difftool "opendiff"]
+    cmd = opendiff \"$LOCAL\" \"$REMOTE\" -merge \"$MERGED\" | cat
+[merge]
+	tool = opendiff

install.conf.yaml

@@ -28,4 +28,5 @@
     ~/.zprezto:
         relink: true
         path: external/prezto/
+    ~/.gitconfig: gitconfig
     ~/.gitignore_global: gitignore_global