diff --git a/.config/git/config b/.config/git/config
index 1d0cfc1..d4fcbab 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -25,7 +25,8 @@
 	s = status
 	yolo = !git commit -m \"$(curl -s https://whatthecommit.com/index.txt)\"
 [merge]
-	ff = no
 	conflictstyle = diff3
 [core]
 	autocrlf = input
+[push]
+	autoSetupRemote = true