git: use nvim for fugitive mergetool

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 9e82d98497439ca730a548213e246b3d182135da..1c55d715640918954a5d9907aaae1b277a37fa11 100644 (file)
--- 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,6 +33,7 @@
        autostash = true
        autosquash = true
        stat = true
+       updateRefs = true
 [status]
        submodulesummary = true
 [rerere]
@@ -41,6 +42,7 @@
        rebase = interactive
 [branch]
        autoSetupMerge = inherit
+       sort = -committerdate
 [branch "master"]
        rebase = merges
 [branch "develop"]