X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/715c6b08aa39ad4cfc18894b7afcafa321a6aa8b..e4963fae03c4d4403fcca3157bebf5e47ef2010f:/gitconfig?ds=sidebyside

diff --git a/gitconfig b/gitconfig
index 2f7f713..485954e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,10 +3,12 @@
 	email = ruben@unlimited.pizza
 	signingkey = B7C3495D98F27947
 [core]
-	editor = vim
+	editor = nvim
 [color]
 	diff = auto
 [push]
 	default = simple
+[pull]
+  rebase = false
 [commit]
 	gpgsign = true