X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/2a83324d56b554696044410179b6eae122e95eca..d6d5dc43533a68afecbcfbf6c93a4fce937d19ae:/git/config?ds=inline

diff --git a/git/config b/git/config
index bfbfc4c..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
@@ -19,3 +19,10 @@
 	smtpserver = smtp.gmail.com
 	smtpuser = samir.benmendil@gmail.com
 	smtpserverport = 587
+[mergetool "fugitive"]
+	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+[merge]
+	tool = fugitive
+	defaultToUpstream = true
+[mergetool]
+	prompt = no