From c46290f82c257b7dd7316bd1214fd5042f67334d Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 12 Apr 2014 13:14:42 +0100
Subject: [PATCH] Update gitconfig

---
 gitconfig | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gitconfig b/gitconfig
index aea2775..007ae96 100644
--- a/gitconfig
+++ b/gitconfig
@@ -33,8 +33,15 @@
 [branch]
   autosetuprebase = always
 [difftool "Kaleidoscope"]
-	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+  cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
 [difftool]
-	prompt = false
+  prompt = false
 [diff]
-	tool = Kaleidoscope
+  tool = Kaleidoscope
+[credential]
+  helper = osxkeychain
+[include]
+  path = ~/.gitconfig_private
+[filter "media"]
+	clean = git-media-clean %f
+	smudge = git-media-smudge %f