X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=home%2F.gitconfig;h=2f805e43b2dedec7e823ad8c237bb81f1b656c67;hb=a31e8c4827b7a225f22425c0208f25a89386a841;hp=fcd0539471525bc7d8642fdf1c6bc5405c994aa2;hpb=c2d030149cea6664a4b9eebe7d309acb5755e971;p=khome.git

diff --git a/home/.gitconfig b/home/.gitconfig
index fcd0539..2f805e4 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -2,14 +2,14 @@
         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
@@ -20,3 +20,8 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool]
+    prompt = false