summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-04-10 09:20:32 +0200
committerAlan Pearce2017-04-10 09:20:32 +0200
commit15cee80b0f179ed08fffe0b41976a2749cab363a (patch)
treef3278981e9ebf4f770d98ba8b1d373e6e0a65fb6
parentda106a2392ebebb3cefb425d3f3ba9285a5e647d (diff)
downloaddotfiles-15cee80b0f179ed08fffe0b41976a2749cab363a.tar.lz
dotfiles-15cee80b0f179ed08fffe0b41976a2749cab363a.tar.zst
dotfiles-15cee80b0f179ed08fffe0b41976a2749cab363a.zip
Git: add "difftool" command (requires icdiff)
-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 6228a08..ed5fc67 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