X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=bd6ae59d020f01b03701a0fc4c2ae9c87f1da6c0;hb=HEAD;hp=1d84f080577c2210aa10cb5faa287d00cd05a855;hpb=53485fd73d19bdf46138a4a895018ddc5c3f7693;p=dotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index 1d84f08..7d19ce5 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,23 +1,25 @@
+[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]
@@ -31,15 +33,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