Simpler and less disturbing :Fmt

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index b00a96b353348eef66d24d962ddf9bba3393b2f2..31d95a546a1220120e44f9302e2a229de834740e 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -16,8 +16,6 @@
 [core]
        excludesfile = /home/stargrave/.git-ignore
        quotepath = false
-       filemode = true
-       logallrefupdates = true
        whitespace = blank-at-eol, space-before-tab, tab-in-indent, blank-at-eof
        pager=diff-highlight | $PAGER
 [log]
@@ -39,6 +37,7 @@
        lineNumber = true
 [merge]
        tool = vimdiff
+       conflictStyle = zdiff3
 [pull]
        ff = only
 [help]
@@ -47,3 +46,5 @@
        defaultBranch = master
 [format]
        useAutoBase = true
+[include]
+       path = /home/stargrave/.git-safe