aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/git/.config
diff options
context:
space:
mode:
Diffstat (limited to 'git/.config')
-rw-r--r--git/.config/git/config10
1 files changed, 10 insertions, 0 deletions
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