feat(gitconfig): added merge option by default when pulling

This commit is contained in:
Sergio Laín 2023-11-19 12:46:14 +01:00
parent 98adef1761
commit 896a952d87
No known key found for this signature in database
GPG key ID: 14C9B8080681777B

View file

@ -29,6 +29,8 @@
blame = diff-so-fancy | less --tabs=4 -RFX blame = diff-so-fancy | less --tabs=4 -RFX
[diff] [diff]
colorMoved = default colorMoved = default
[pull]
rebase = false
[commit] [commit]
gpgsign = true gpgsign = true
[gpg] [gpg]