From 89dfa53bc22a4d618b9fef273b1c0c806af9b0d1 Mon Sep 17 00:00:00 2001 From: Bodaniel Jeanes Date: Tue, 30 Nov 2010 00:03:26 +1000 Subject: [PATCH] Add Kaleidoscope as diff tool --- git/gitconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git/gitconfig b/git/gitconfig index c8d9814..2afce61 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -27,3 +27,9 @@ default = tracking [diff "ruby"] funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\) +[difftool "Kaleidoscope"] + cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\" +[difftool] + prompt = false +[diff] + tool = Kaleidoscope