extern/dotfiles
1
0
Fork 0
mirror of https://github.com/Lissy93/dotfiles.git synced 2025-02-18 07:40:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sets default merge strategy in .gitconfig

Browse Source
This commit is contained in:
Alicia Sykes 2022-08-09 16:28:51 +01:00
parent 686569f052
commit b924223056
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/.gitconfig
View File

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