Set rebase to false on pull from git

[rbdr/dotfiles] / gitconfig

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

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

 [core]
        editor = vim
 [color]
        diff = auto
 [push]
        default = simple
 [core]
        editor = vim
 [color]
        diff = auto
 [push]
        default = simple

+[pull]
+  rebase = false

 [commit]
        gpgsign = true
 [commit]
        gpgsign = true

-[gpg]
-       program = gpg2