1 files changed, 4 insertions, 0 deletions

diff --git a/.gitconfig b/.gitconfig
index 2aa7aac..88672f3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,7 @@
 	username = HappyTramp
 [log]
 	decorate = full
+[pull]
+	rebase = false
+[merge]
+	tool = vimdiff