git: interactive rebase when pulling, except master/develop

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 2892abba270bfc37bb2f1af588dfdadddbea7d0c..e7e4541b522592ef4444c6e512b483d2533d74c2 100644 (file)
--- a/git/config
+++ b/git/config
@@ -33,3 +33,9 @@
        submodulesummary = true
 [rerere]
        enabled = true
        submodulesummary = true
 [rerere]
        enabled = true

+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve