Use neovim in git

[khome.git] / home / .gitconfig

diff --git a/home/.gitconfig b/home/.gitconfig
index 0fb589e..2f805e4 100644 (file)
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -2,16 +2,26 @@
         name = Siraaj Khandkar
         email = siraaj@khandkar.net
 [core]
-        editor = /usr/bin/vim
+        editor = /usr/bin/nvim
         excludesfile = ~/.gitignore_global
 [color]
         ui = true
 [cola]
        spellcheck = false
 [init]
-       defaultBranch = master
+       defaultBranch = dominus # as in "dominus ramus"
 #[filter "lfs"]
 #      required = true
 #      clean = git-lfs clean -- %f
 #      smudge = git-lfs smudge -- %f
 #      process = git-lfs filter-process
+[filter "lfs"]
+       clean = git-lfs clean -- %f
+       smudge = git-lfs smudge -- %f
+       process = git-lfs filter-process
+       required = true
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool]
+    prompt = false