git: interactive rebase when pulling, except master/develop

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 805f94a5ee33253f89132afed474b5a228b06d75..e7e4541b522592ef4444c6e512b483d2533d74c2 100644 (file)
--- a/git/config
+++ b/git/config
@@ -26,3 +26,16 @@
        defaultToUpstream = true
 [mergetool]
        prompt = no
+[rebase]
+       autostash = true
+       autosquash = true
+[status]
+       submodulesummary = true
+[rerere]
+       enabled = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve