[user]
name = Sergey Matveev
email = stargrave@stargrave.org
- signingkey = "E49857EF"
+ signingkey = "12AD32689C660D426967FD75CB8205632107AD8A"
[color]
diff = auto
status = auto
[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]
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