+[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
- 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]
[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
+[safe]
+ directory = *
+[includeIf "gitdir:~/work/stc/"]
+ path = ~/work/stc/.gitconfig