summaryrefslogtreecommitdiff
path: root/gitconfig-exolobe1
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2023-01-16 15:43:11 +0200
committerLars Wirzenius <liw@liw.fi>2023-01-16 15:43:11 +0200
commitc73a42098882ab56b3d4748a3c9625c78135d6bb (patch)
tree7ebac0190c0ff858bce8dc636a84b58f21017d1c /gitconfig-exolobe1
parentd65f166700117ca8cdcbc019144f52405c82d29d (diff)
downloadliw-dot-files-c73a42098882ab56b3d4748a3c9625c78135d6bb.tar.gz
git: only use difftastic with "git difftool"
Sometimes I want the raw diff and this seems like an easy way to achieve that. Sponsored-by: author
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