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

diff --git a/git/config b/git/config
index 06d2603..805f94a 100644
--- a/git/config
+++ b/git/config
@@ -1,6 +1,6 @@
 [user]
 	name = Samir Benmendil
-	email = samir.benmendil@gmail.com
+	email = me@rmz.io
 [color]
 	branch = auto
 	status = auto
@@ -23,5 +23,6 @@
 	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
 	tool = fugitive
+	defaultToUpstream = true
 [mergetool]
 	prompt = no