diff options
| author | Toby Vincent <tobyv@tobyvin.dev> | 2023-10-23 15:04:17 -0500 |
|---|---|---|
| committer | Toby Vincent <tobyv@tobyvin.dev> | 2023-10-23 15:04:17 -0500 |
| commit | 6c2d7a1ba99e18c5d2b91f6cd174fcbe789b0fbd (patch) | |
| tree | 9aed008fce34c645e1115c8ecd247eacdcc05c57 | |
| parent | a40fb46f492b717e8c63d8d7cb394a987d6f3b55 (diff) | |
fix(git): use difftastic for difftool over default
| -rwxr-xr-x | difft/.config/profile.d/50-difft.sh | 6 | ||||
| -rw-r--r-- | git/.config/git/config | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/difft/.config/profile.d/50-difft.sh b/difft/.config/profile.d/50-difft.sh deleted file mode 100755 index 5791599..0000000 --- a/difft/.config/profile.d/50-difft.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -DFT_DISPLAY='side-by-side-show-both' -GIT_EXTERNAL_DIFF=$(command -v "difft") - -export GIT_EXTERNAL_DIFF DFT_DISPLAY diff --git a/git/.config/git/config b/git/.config/git/config index 12f549a..3c67ee6 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -31,6 +31,16 @@ reference = true [diff] colorMoved = default +tool = difft + +[difftool] +prompt = false + +[difftool "difft"] +cmd = difft "$LOCAL" "$REMOTE" + +[pager] +difftool = true [merge] tool = nvimdiff |