Set rebase to false on pull from git

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 3be84dbf5b477d424e455643ade5b3ec6f056185..e60d8a9c0c56a575f1dd9862f8454f39e842b56d 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,14 @@
 [user]
 [user]

-       name = Ben Beltran
-       email = ben@nsovocal.com
+       name = Ruben Beltran del Rio
+       email = ruben@unlimited.pizza
+       signingkey = B7C3495D98F27947

 [core]
        editor = vim
 [color]
        diff = auto
 [core]
        editor = vim
 [color]
        diff = auto

+[push]
+       default = simple
+[pull]
+  rebase = false
+[commit]
+       gpgsign = true