From e8220bab1b5b18e8629a7d59bd2ba2e2cb832f87 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Mon, 12 Jan 2015 11:15:11 -0600
Subject: [PATCH] Add Kaleidoscope configuration

Kaleidoscope is a diff tool. Add configuration for it and a shortcut to
run it `git dkal`
---
 git/gitconfig.symlink | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 13dc14d..4512170 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -74,6 +74,9 @@
     aa = !git ls-files -d | xargs git rm && git ls-files -m -o --exclude-standard | xargs git add
     # remove grep - Remove found files that are NOT under version control
     rg = "!sh -c 'git ls-files --others --exclude-standard | grep $1 | xargs rm' -"
+
+    # Kaleidoscope commands
+    dkal = difftool -y -t Kaleidoscope
 [color]
     diff = auto
     status = auto
@@ -122,3 +125,8 @@
     lineNumber = true
 [credential]
 	helper = osxkeychain
+[difftool "Kaleidoscope"]
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[mergetool "Kaleidoscope"]
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustexitcode = true