git: interactive rebase when pulling, except master/develop

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 1c5b482339fc048e2548fc93b43e20da3afb3118..e7e4541b522592ef4444c6e512b483d2533d74c2 100644 (file)
--- a/git/config
+++ b/git/config
@@ -32,4 +32,10 @@
 [status]
        submodulesummary = true
 [rerere]
 [status]
        submodulesummary = true
 [rerere]

-       enable = true
+       enabled = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve