Replace deoplete with coc

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 2f7f713fc3b9203f72c266d9540d62cb1b7e260e..485954e152f1e06333b6b1dbb379e5b5f9757740 100644 (file)
--- 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