diff --git a/git/.gitconfig b/git/.gitconfig
index a474eb3..e154dd0 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -13,6 +13,10 @@
 	last = cat-file commit HEAD
 [branch]
   autoSetupRebase = always
+[merge]
+  ff = only
+[push]
+  autoSetupRemote = true
 [rerere]
 	enabled = true
 [remote]