diff --git a/.gitconfig b/.gitconfig
index 5cb919e..f18158d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,6 +28,6 @@
 [credential]
 	helper=osxkeychain
 [branch]
-	autosetupmerge = true
+	autosetupmerge = always
 [http]
 	postBuffer = 5242880000