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

diff --git a/home/.gitconfig b/home/.gitconfig
index fcd0539..c8e41e2 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -9,7 +9,7 @@
 [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