diff options
| author | Lars Wirzenius <liw@liw.fi> | 2023-01-16 15:43:11 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2023-01-16 15:43:11 +0200 |
| commit | c73a42098882ab56b3d4748a3c9625c78135d6bb (patch) | |
| tree | 7ebac0190c0ff858bce8dc636a84b58f21017d1c | |
| parent | d65f166700117ca8cdcbc019144f52405c82d29d (diff) | |
| download | liw-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
| -rw-r--r-- | gitconfig-exolobe1 | 8 | ||||
| -rw-r--r-- | gitconfig-upcloud | 3 |
2 files changed, 7 insertions, 4 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 diff --git a/gitconfig-upcloud b/gitconfig-upcloud index 28bdb03..f28f26e 100644 --- a/gitconfig-upcloud +++ b/gitconfig-upcloud @@ -4,6 +4,3 @@ [commit] template = /home/liw/liw-dot-files/git-commit-template-upcloud - -[diff] - external = difft |