Do not know what for diff.noprefix is useful

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index b3d796fd5889cee173806688567889e9e3d31a89..48716f3a30c5e4415199dcb6a973f63e32063032 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -33,10 +33,12 @@
        colorMoved = default
        colorMovedWS = allow-indentation-change
        tool = vimdiff
+       noprefix = true
 [grep]
        lineNumber = true
 [merge]
        tool = vimdiff
+       conflictStyle = zdiff3
 [pull]
        ff = only
 [help]
@@ -45,3 +47,5 @@
        defaultBranch = master
 [format]
        useAutoBase = true
+[include]
+       path = /home/stargrave/.git-safe