summaryrefslogtreecommitdiff
path: root/gitconfig-exolobe1
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig-exolobe1')
-rw-r--r--gitconfig-exolobe18
1 files changed, 7 insertions, 1 deletions
diff --git a/gitconfig-exolobe1 b/gitconfig-exolobe1
index c30661d..833d4da 100644
--- a/gitconfig-exolobe1
+++ b/gitconfig-exolobe1
@@ -48,7 +48,13 @@
diffFilter = delta --color-only --features=interactive
[diff]
- external = difft
+ tool = difftastic
+
+[difftool]
+ prompt = false
+
+[difftool "difftastic"]
+ cmd = difft "$LOCAL" "$REMOTE"
[includeIf "gitdir:~/UpCloud/"]
path = ~/liw-dot-files/gitconfig-upcloud