X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/64cc705a45ab5e99f5500cfffbeaec2c451db14a..b5287d30fcaac638fd86a64bac729bf60f51a673:/git/config?ds=sidebyside

diff --git a/git/config b/git/config
index 911ad2c..deadf5c 100644
--- a/git/config
+++ b/git/config
@@ -1,13 +1,13 @@
 [user]
 	name = Samir Benmendil
-	email = samir.benmendil@gmail.com
+	email = me@rmz.io
 [color]
 	branch = auto
 	status = auto
 	ui = auto
 	diff = auto
 [push]
-	default = simple
+	default = current
 [diff]
 	tool = vimdiff
 [color "diff"]
@@ -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