git: interactive rebase when pulling, except master/develop

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 21d2ea605d7bb6f3010886a1424f1375c9466c0f..e7e4541b522592ef4444c6e512b483d2533d74c2 100644 (file)
--- a/git/config
+++ b/git/config
@@ -28,3 +28,14 @@
        prompt = no
 [rebase]
        autostash = true
+       autosquash = true
+[status]
+       submodulesummary = true
+[rerere]
+       enabled = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve