21d16bafb00b

git: add Kaleidoscope as a difftool
[view raw] [browse files]
author Steve Losh <steve@dwaiter.com>
date Fri, 25 Jun 2010 15:07:22 -0400
parents 65c514961585
children e42e595b17c2
branches/tags (none)
files .gitconfig

Changes

--- a/.gitconfig	Sun Jun 20 14:09:32 2010 -0400
+++ b/.gitconfig	Fri Jun 25 15:07:22 2010 -0400
@@ -26,3 +26,9 @@
 diff = auto
 interactive = auto
 status = auto
+[difftool "Kaleidoscope"]
+	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+[difftool]
+	prompt = false
+[diff]
+	tool = Kaleidoscope