summary refs log tree commit diff stats
path: root/git/.config
diff options
context:
space:
mode:
Diffstat (limited to 'git/.config')
-rw-r--r--git/.config/git/config6
1 files changed, 6 insertions, 0 deletions
diff --git a/git/.config/git/config b/git/.config/git/config
index 6228a08b..ed5fc67a 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -32,3 +32,9 @@
 	autosquash = true
 [rerere]
 	enabled = true
+[diff]
+  tool = icdiff
+[difftool]
+  prompt = false
+[difftool "icdiff"]
+  cmd = icdiff --line-numbers $LOCAL $REMOTE
\ No newline at end of file