X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/35de64bc393b9aa9c144cc6b7ce1898fbe8f7ea4..90eec7c63e47bdf279a841605e151e07db30b399:/git/config

diff --git a/git/config b/git/config
index 1c5b482..deadf5c 100644
--- a/git/config
+++ b/git/config
@@ -7,7 +7,7 @@
 	ui = auto
 	diff = auto
 [push]
-	default = simple
+	default = current
 [diff]
 	tool = vimdiff
 [color "diff"]
@@ -32,4 +32,10 @@
 [status]
 	submodulesummary = true
 [rerere]
-	enable = true
+	enabled = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve