diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2021-01-13 11:28:57 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2021-01-13 11:28:57 +0100 |
commit | b7eafd6b952466fe19b198b461f3e98b543dcba9 (patch) | |
tree | 93a6990e523d096e6d488c47e3f8c830e481db9e /gitconfig | |
parent | f700afd9bcacd4f91daa9ca28e8592bd8f5055db (diff) |
Use kdiff3 for git, set default branch to main
Diffstat (limited to 'gitconfig')
-rw-r--r-- | gitconfig | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |