diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2023-05-12 17:01:26 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2023-05-12 17:01:26 +0200 |
| commit | 432eb7ba89c46f97b4d13575d1de2fb41ae83be5 (patch) | |
| tree | 8764ade1f336cccf2084f39ce171d601a0eff70f /gitconfig | |
| parent | 3c07fde676dd40a11d2233d80f2cdedb4ae02c97 (diff) | |
git difftool for comparing R Data files
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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:"] |