git: interactive rebase when pulling, except master/develop

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 0e41b1f17baae3a86ce3a919f3cbcf026e74fa2b..e7e4541b522592ef4444c6e512b483d2533d74c2 100644 (file)
--- a/git/config
+++ b/git/config
@@ -31,3 +31,11 @@
        autosquash = true
 [status]
        submodulesummary = true
        autosquash = true
 [status]
        submodulesummary = true

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