X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/c9c7d8b583f8978c171b3985abf10362ea0034e8..e081ae2be04bf7224eadc202f3b9e821d65a440b:/git/config?ds=sidebyside

diff --git a/git/config b/git/config
index 8f78436..9e82d98 100644
--- a/git/config
+++ b/git/config
@@ -39,6 +39,8 @@
 	enabled = true
 [pull]
 	rebase = interactive
+[branch]
+	autoSetupMerge = inherit
 [branch "master"]
 	rebase = merges
 [branch "develop"]