X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/2a83324d56b554696044410179b6eae122e95eca..d8a4be5d3f2691d8948919bc1e32f58cbfaf1a2e:/git/config

diff --git a/git/config b/git/config
index bfbfc4c..f7e4f40 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"]
@@ -19,3 +19,25 @@
 	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
+[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