Sets default merge strategy in .gitconfig

This commit is contained in:
Alicia Sykes 2022-08-09 16:28:51 +01:00
parent 686569f052
commit b924223056

View File

@ -7,6 +7,8 @@
username = lissy93
[init]
defaultBranch = master
[pull]
rebase = false
[core]
editor = nvim
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol