diff --git a/.gitconfig b/.gitconfig
index 263f035447..09ba1c8785 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -53,6 +53,9 @@
 [merge]
 	tool = opendiff
 
+[branch]
+	autosetuprebase = always
+
 # rewrites of repo paths
 [url "git@github.com:"]
 	insteadOf = "gh:"