X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/fb657354cd3a63f8415f7ee4716903c18c5ed549..dcf942832c89d1a80a34bea27e362dbcdc8a6795:/git/config

diff --git a/git/config b/git/config
index 06d2603..801601a 100644
--- a/git/config
+++ b/git/config
@@ -1,13 +1,14 @@
 [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
+	recurseSubmodules = check
 [diff]
 	tool = vimdiff
 [color "diff"]
@@ -16,12 +17,27 @@
 	meta = green
 [sendemail]
 	smtpencryption = tls
-	smtpserver = smtp.gmail.com
-	smtpuser = samir.benmendil@gmail.com
-	smtpserverport = 587
+	smtpserver = /usr/bin/msmtp
+	smtpuser = 
 [mergetool "fugitive"]
 	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
 	tool = fugitive
+	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
+[commit]
+	verbose = true