diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2021-01-13 09:47:02 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2021-01-13 09:47:02 +0100 |
commit | f700afd9bcacd4f91daa9ca28e8592bd8f5055db (patch) | |
tree | 428e154698e46acaf7a7f54388b390f2b3911a3b /gitconfig | |
parent | 9fd898fd105a5447c0d62d77815a129b66e0338c (diff) |
Use kdiff3 for git diff
Diffstat (limited to 'gitconfig')
-rw-r--r-- | gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -9,8 +9,12 @@ excludesfile = ~/.gitignore autocrlf = input pager = /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less --tabs=4 -RFX +[diff] + external = ~/bin/git_diff [merge] tool = vimdiff [url "git@salsa.debian.org:"] pushInsteadOf = https://salsa.debian.org/ insteadOf = salsa: +[credential] + helper = cache |