Make daily todo file template

[khome.git] / home / .gitconfig

diff --git a/home/.gitconfig b/home/.gitconfig
index 0fb589e..ba90195 100644 (file)
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -15,3 +15,13 @@
 #      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