mirror of
https://github.com/Lissy93/dotfiles.git
synced 2025-06-28 04:51:21 +02:00
Sets default merge strategy in .gitconfig
This commit is contained in:
parent
686569f052
commit
b924223056
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user