diff --git a/git/gitconfig b/git/gitconfig
index e0594de..5ca7472 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -32,5 +32,8 @@
     todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *'
 [merge]
     tool = vimdiff
+    ff = false
 [push]
     default = current
+[branch]
+    autosetuprebase = always