From e7eedc99be1d5f2e9f447f33d1f7f8211848221d Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Mon, 16 Sep 2013 11:39:41 +0200
Subject: [PATCH] gitconfig for mac boxes

---
 gitconfig_mac | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 gitconfig_mac

diff --git a/gitconfig_mac b/gitconfig_mac
new file mode 100644
index 00000000..ada24b04
--- /dev/null
+++ b/gitconfig_mac
@@ -0,0 +1,27 @@
+[user]
+	name = Cyryl Plotnicki-Chudyk
+
+[mergetool "filemerge"]
+	cmd = /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -merge $MERGED -left $LOCAL -ancestor $BASE -right $REMOTE
+	trustExitCode = false
+[core]
+	excludesfile = /Users/cplotnicki/.gitignore_global
+[difftool "kdiff3"]
+    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+    trustExitCode = false
+[difftool]
+    prompt = false
+[diff]
+    tool = kdiff3
+[mergetool "kdiff3"]
+    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+    trustExitCode = false
+    keepBackup = false
+[merge]
+    tool = kdiff3
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true