From: Samir Benmendil <me@rmz.io>
Date: Wed, 22 Mar 2023 09:37:26 +0000 (+0000)
Subject: git: inherit current upstream when creating a new branch
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/182c5e401058cfc74028460fc7a46c0012a7c4d3

git: inherit current upstream when creating a new branch

This should work better with my workflow of pulling from origin master
by default to rebase.
---

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