X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=git%2F.gitconfig;h=b00a96b353348eef66d24d962ddf9bba3393b2f2;hb=HEAD;hp=5919b90fd3468f93369bc5a3b7a3dfb63e3896d8;hpb=7221073db21340ebc2386e6df3c77482163a6662;p=dotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index 5919b90..fdfcc01 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,24 +1,27 @@
+[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]
@@ -30,15 +33,23 @@
 [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