From: Samir Benmendil <samir.benmendil@ultrahaptics.com>
Date: Mon, 15 May 2017 09:56:44 +0000 (+0100)
Subject: git: interactive rebase when pulling, except master/develop
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/66c6b2daeecf9af749a565faad35ad54f87e0154

git: interactive rebase when pulling, except master/develop

master and develop branches should try to preserve merges when rebasing.

Now this is not ideal because the branch names are hard-coded, if I
contribute to a project that names their main branch `dev` it will
default to `interactive` :/
---

diff --git a/git/config b/git/config
index 2892abb..e7e4541 100644
--- a/git/config
+++ b/git/config
@@ -33,3 +33,9 @@
 	submodulesummary = true
 [rerere]
 	enabled = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve