diff --git a/gitconfig.local b/gitconfig.local index b4f89af..eba8a07 100644 --- a/gitconfig.local +++ b/gitconfig.local @@ -12,9 +12,16 @@ clean = git-lfs clean %f smudge = git-lfs smudge %f [diff] - tool = Kaleidoscope + external = difft + tool = difftastic +[difftool] + prompt = false [difftool "Kaleidoscope"] cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[pager] + difftool = true [alias] ksdiff = difftool -yt Kaleidoscope [tig]