git: set push action to "current"

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 0e41b1f17baae3a86ce3a919f3cbcf026e74fa2b..deadf5c5bde2388ac2f7b104106c853270af0c46 100644 (file)
--- a/git/config
+++ b/git/config
@@ -7,7 +7,7 @@
        ui = auto
        diff = auto
 [push]
-       default = simple
+       default = current
 [diff]
        tool = vimdiff
 [color "diff"]
@@ -31,3 +31,11 @@
        autosquash = true
 [status]
        submodulesummary = true
+[rerere]
+       enabled = true
+[pull]
+       rebase = interactive
+[branch "master"]
+       rebase = preserve
+[branch "develop"]
+       rebase = preserve