diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index f43537c..85f629f 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -1,5 +1,5 @@
 # env
-# Written in 2019 by Lucas
+# Written in 2019-2020 by Lucas
 # CC0 1.0 Universal/Public domain - No rights reserved
 #
 # To the extent possible under law, the author(s) have dedicated all
@@ -14,7 +14,7 @@
 	email = lucas@domain.invalid
 
 [core]
-	editor = ed
+	editor = vi
 	excludesfile = ~/.gitignore
 
 [color]
@@ -37,5 +37,8 @@
 	st = status -s
 	tree = log --all --graph --pretty='%h%d %aN: %s'
 
+[pull]
+	rebase = false
+
 [push]
 	default = simple