From b7eafd6b952466fe19b198b461f3e98b543dcba9 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 13 Jan 2021 11:28:57 +0100
Subject: Use kdiff3 for git, set default branch to main

---
 gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 56527a0..42275e1 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,7 +8,6 @@
 [core]
   excludesfile = ~/.gitignore
   autocrlf = input
-  pager = /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less --tabs=4 -RFX
 [diff]
   external = ~/bin/git_diff
 [merge]
@@ -18,3 +17,5 @@
   insteadOf = salsa:
 [credential]
 	helper = cache
+[init]
+	defaultBranch = main
-- 
cgit v1.2.1