summaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig8
1 files changed, 6 insertions, 2 deletions
diff --git a/gitconfig b/gitconfig
index 7487e7a..592b8f8 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,8 +8,12 @@
[core]
excludesfile = ~/.gitignore
autocrlf = input
-[diff]
-# external = ~/bin/git_diff
+[difftool]
+ prompt = false
+[difftool "rda_diff"]
+ cmd = ~/bin/rda_diff $LOCAL $REMOTE
+[difftool "rda_diff_inf"]
+ cmd = ~/bin/rda_diff -m Inf $LOCAL $REMOTE
[merge]
tool = vimdiff
[url "git@salsa.debian.org:"]

Contact - Imprint