diff --git a/.gitconfig.MKAYSIGREP b/.gitconfig.MKAYSIGREP
index 0be9133d..41b5e82c 100644
--- a/.gitconfig.MKAYSIGREP
+++ b/.gitconfig.MKAYSIGREP
@@ -21,3 +21,5 @@
 	signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
+[branch]
+	autosetupmerge = always
diff --git a/gitconfig b/gitconfig
index 7c8f92ad..ab98ff10 100644
--- a/gitconfig
+++ b/gitconfig
@@ -21,3 +21,5 @@
 	#signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
+[branch]
+	autosetupmerge = always