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

diff --git a/git/config b/git/config
index 8f78436..406c28c 100644
--- a/git/config
+++ b/git/config
@@ -22,7 +22,7 @@
 	smtpserver = /usr/bin/msmtp
 	smtpuser = 
 [mergetool "fugitive"]
-	cmd = vim -f -c \"Gdiffsplit!\" \"$MERGED\"
+	cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
@@ -33,12 +33,17 @@
 	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"]