Work git configuration

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 31d95a546a1220120e44f9302e2a229de834740e..9d70461bf597eb5b4bbc0d73fd048c8095d1b395 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -7,7 +7,7 @@
 [user]
        name = Sergey Matveev
        email = stargrave@stargrave.org
-       signingkey = "E49857EF"
+       signingkey = "12AD32689C660D426967FD75CB8205632107AD8A"
 [color]
        diff = auto
        status = auto
@@ -33,6 +33,7 @@
        colorMoved = default
        colorMovedWS = allow-indentation-change
        tool = vimdiff
+       noprefix = true
 [grep]
        lineNumber = true
 [merge]
@@ -46,5 +47,7 @@
        defaultBranch = master
 [format]
        useAutoBase = true
-[include]
-       path = /home/stargrave/.git-safe
+[safe]
+       directory = *
+[includeIf "gitdir:~/work/stc/"]
+       path = ~/work/stc/.gitconfig