X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/172cfbb4b15794f9dd12a4531e6ba6b8f0edbb2a..dcf942832c89d1a80a34bea27e362dbcdc8a6795:/git/config?ds=inline

diff --git a/git/config b/git/config
index 2892abb..801601a 100644
--- a/git/config
+++ b/git/config
@@ -7,7 +7,8 @@
 	ui = auto
 	diff = auto
 [push]
-	default = simple
+	default = current
+	recurseSubmodules = check
 [diff]
 	tool = vimdiff
 [color "diff"]
@@ -16,9 +17,8 @@
 	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]
@@ -33,3 +33,11 @@
 	submodulesummary = true
 [rerere]
 	enabled = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve
+[commit]
+	verbose = true