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