X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/9c2d6207d41a80c9438aae9de4547c196f79cedf..refs/heads/uh-backup:/git/config

diff --git a/git/config b/git/config
index 0e41b1f..04e0405 100644
--- a/git/config
+++ b/git/config
@@ -1,13 +1,14 @@
 [user]
 	name = Samir Benmendil
-	email = me@rmz.io
+	email = samir.benmendil@ultrahaptics.com
 [color]
 	branch = auto
 	status = auto
 	ui = auto
 	diff = auto
 [push]
-	default = simple
+	default = current
+	recurseSubmodules = check
 [diff]
 	tool = vimdiff
 [color "diff"]
@@ -16,11 +17,10 @@
 	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\"
+	cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
@@ -31,3 +31,21 @@
 	autosquash = true
 [status]
 	submodulesummary = true
+[rerere]
+	enabled = true
+[pull]
+	rebase = interactive
+[branch "master"]
+	rebase = preserve
+[branch "develop"]
+	rebase = preserve
+[commit]
+	verbose = true
+[alias]
+	remote-to-ssh = "!f(){ local r=$1; git remote set-url $r $(git remote get-url $r | sed -r 's,https?://([^/]+),git@\\1:,'); };f"
+	clean-orig = "!git ls-files -o --exclude-standard | grep '\\.orig$' | xargs -n100 -p rm"
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true