HI flag

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index b3d796fd5889cee173806688567889e9e3d31a89..7d19ce51cc980b47c904fc119ea4aeca8e109a5d 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,19 +1,23 @@
+[pack]
+       threads = 8
 [advice]
        pushUpdateRejected = false
        detachedHead = false
+       addIgnoredFile = false
 [alias]
        wt = worktree
        unchanged = update-index --assume-unchanged
 [user]
        name = Sergey Matveev
        email = stargrave@stargrave.org
-       signingkey = "E49857EF"
+       signingkey = "12AD32689C660D426967FD75CB8205632107AD8A"
 [color]
        diff = auto
        status = auto
        branch = auto
        interactive = auto
 [core]
+       compression = 0
        excludesfile = /home/stargrave/.git-ignore
        quotepath = false
        whitespace = blank-at-eol, space-before-tab, tab-in-indent, blank-at-eof
@@ -33,10 +37,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 +51,7 @@
        defaultBranch = master
 [format]
        useAutoBase = true
+[safe]
+       directory = *
+[includeIf "gitdir:~/work/stc/"]
+       path = ~/work/stc/.gitconfig