X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/9c2d6207d41a80c9438aae9de4547c196f79cedf..fdd63454b51a35418ec23d3489cf20ae66a2299d:/git/config

diff --git a/git/config b/git/config
index 0e41b1f..406c28c 100644
--- a/git/config
+++ b/git/config
@@ -7,27 +7,59 @@
 	ui = auto
 	diff = auto
 [push]
-	default = simple
+	default = current
+	recurseSubmodules = check
 [diff]
 	tool = vimdiff
+[diff "gpg"]
+	textconv = gpg --quiet --decrypt --use-agent
 [color "diff"]
 	new = cyan bold
 	old = red bold
 	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 = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
+	conflictstyle = diff3
 [mergetool]
 	prompt = no
 [rebase]
 	autostash = true
 	autosquash = true
+	stat = true
+	updateRefs = true
+	rescheduleFailedExec = true
 [status]
 	submodulesummary = true
+[rerere]
+	enabled = true
+[pull]
+	rebase = interactive
+[branch]
+	autoSetupMerge = inherit
+	sort = -committerdate
+[branch "master"]
+	rebase = merges
+[branch "develop"]
+	rebase = merges
+[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
+
+[includeIf "gitdir:~/src/fpp/**"]
+	path = ~/.config/git/fpp.config
+[credential]
+	helper = cache