From f700afd9bcacd4f91daa9ca28e8592bd8f5055db Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 13 Jan 2021 09:47:02 +0100 Subject: Use kdiff3 for git diff --- gitconfig | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gitconfig') diff --git a/gitconfig b/gitconfig index 103b345..56527a0 100644 --- a/gitconfig +++ b/gitconfig @@ -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 -- cgit v1.2.1