summaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2021-01-13 11:28:57 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2021-01-13 11:28:57 +0100
commitb7eafd6b952466fe19b198b461f3e98b543dcba9 (patch)
tree93a6990e523d096e6d488c47e3f8c830e481db9e /gitconfig
parentf700afd9bcacd4f91daa9ca28e8592bd8f5055db (diff)
Use kdiff3 for git, set default branch to main
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig3
1 files changed, 2 insertions, 1 deletions
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

Contact - Imprint