diff --git a/git/.config/git/config b/git/.config/git/config
index 827c5ad..aa2a91a 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -19,6 +19,7 @@
 
 [push]
 	default = simple
+	autoSetupRemote = true
 
 [merge]
 	tool = vimdiff
@@ -45,6 +46,8 @@
 
 [rebase]
 	autosquash = true
+	updateRefs = true
+	autoStash = true
 
 [fetch]
 	prune = true