Work git configuration

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 7c3b438232aae2d04ffa7bdb45a28570a72b29ab..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
@@ -16,9 +16,8 @@
 [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]
        date = iso8601
 [push]
@@ -30,6 +29,25 @@
 [notes]
        displayRef = *
 [diff]
-       algorithm = patience
+       algorithm = histogram
+       colorMoved = default
+       colorMovedWS = allow-indentation-change
+       tool = vimdiff
+       noprefix = true
 [grep]
        lineNumber = true
+[merge]
+       tool = vimdiff
+       conflictStyle = zdiff3
+[pull]
+       ff = only
+[help]
+       autocorrect = never
+[init]
+       defaultBranch = master
+[format]
+       useAutoBase = true
+[safe]
+       directory = *
+[includeIf "gitdir:~/work/stc/"]
+       path = ~/work/stc/.gitconfig