X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/84e2deef3e6453881262f3cc49e2f38187383bc4..cbfa57a03cbbefbc6bf682757e27615aa7e633e4:/git/config

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"]