From 432eb7ba89c46f97b4d13575d1de2fb41ae83be5 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 12 May 2023 17:01:26 +0200 Subject: git difftool for comparing R Data files --- gitconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gitconfig') 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:"] -- cgit v1.2.1