X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=blobdiff_plain;f=git%2F.gitconfig;h=b00a96b353348eef66d24d962ddf9bba3393b2f2;hp=9862326e3b7dfb6e94b0096fae5ea634bfd1038c;hb=HEAD;hpb=a5e85a783b53736f297c87d1e8537a8ddeba6840

diff --git a/git/.gitconfig b/git/.gitconfig
index 9862326..7d19ce5 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,21 +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]
@@ -27,8 +33,25 @@
 [notes]
 	displayRef = *
 [diff]
-	algorithm = patience
+	algorithm = histogram
+	colorMoved = default
+	colorMovedWS = allow-indentation-change
+	tool = vimdiff
+	noprefix = true
 [grep]
 	lineNumber = true
-[advice]
-    detachedHead = false
+[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