diff --git a/gitconfig b/gitconfig index dee4d0c..aea2775 100644 --- a/gitconfig +++ b/gitconfig @@ -32,3 +32,9 @@ lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -- [branch] autosetuprebase = always +[difftool "Kaleidoscope"] + cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\" +[difftool] + prompt = false +[diff] + tool = Kaleidoscope