X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/26cffcc308aaa83e59c70ba44049e7c6555844d3..11a0c9f9676ea9f8f0e8768b3e6cc569786320c4:/git/config

diff --git a/git/config b/git/config
index 28e18e4..0461dfd 100644
--- a/git/config
+++ b/git/config
@@ -20,10 +20,11 @@
 	smtpserver = /usr/bin/msmtp
 	smtpuser = 
 [mergetool "fugitive"]
-	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
+	cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
+	conflictstyle = diff3
 [mergetool]
 	prompt = no
 [rebase]
@@ -36,10 +37,19 @@
 [pull]
 	rebase = interactive
 [branch "master"]
-	rebase = preserve
+	rebase = merges
 [branch "develop"]
-	rebase = preserve
+	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