From 1c659875c855325df6d06662b5b81b46266590b9 Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Thu, 7 Dec 2017 14:41:04 -0500 Subject: [PATCH] Add Kaleidoscope as a diff tool --- gitconfig.local | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitconfig.local b/gitconfig.local index e5817fd..327d259 100644 --- a/gitconfig.local +++ b/gitconfig.local @@ -6,3 +6,9 @@ required = true clean = git-lfs clean %f smudge = git-lfs smudge %f +[diff] + tool = Kaleidoscope +[difftool "Kaleidoscope"] + cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" +[alias] + ksdiff = difftool -yt Kaleidoscope