dotfiles: sync

git/.gitconfig

@@ -83,6 +83,8 @@
   excludesfile = ~/.gitignore_global
   attributesfile = ~/.gitattributes
 
+  ignorecase = false
+
   # Treat spaces before tabs and all kinds of trailing whitespace as an error
   # [default] trailing-space: looks for spaces at the end of a line
   # [default] space-before-tab: looks for spaces before tabs at the beginning of a line
@@ -160,7 +162,6 @@
   insteadOf = "github:"
 
 [url "git@gist.github.com:"]
-
   insteadOf = "gst:"
   pushInsteadOf = "gist:"
   pushInsteadOf = "git://gist.github.com/"
@@ -170,3 +171,14 @@
 
 [diff-so-fancy]
   markEmptyLines = false
+
+[merge]
+    tool = nvim
+
+[mergetool]
+    keepBackup = false
+
+[mergetool "nvim"]
+    cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[pull]
+	default = current