diff --git a/dots/.gitconfig b/dots/.gitconfig
index 5e77ada8..114eb7af 100644
--- a/dots/.gitconfig
+++ b/dots/.gitconfig
@@ -46,5 +46,10 @@
     unstage = reset HEAD --
 [push]
     autoSetupRemote = true
+    default = current
 [merge]
     conflictstyle = diff3
+[branch]
+    autosetupmerge = always
+[remote]
+    pushDefault = origin