X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=a628499f7a0bd74d4beccad37afe29d31db3a917;hb=93bc336e3fef66b5f19c214104903f4cc2d2fb8e;hp=0263b614a5323972a520d289b4be8ddd385cbe30;hpb=156214194e82f4c8c3cec765250a80cbbf8746c6;p=dotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index 0263b61..a628499 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -7,7 +7,7 @@
 [user]
 	name = Sergey Matveev
 	email = stargrave@stargrave.org
-	signingkey = "E49857EF"
+	signingkey = "12AD32689C660D426967FD75CB8205632107AD8A"
 [color]
 	diff = auto
 	status = auto
@@ -16,9 +16,8 @@
 [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]
 	date = iso8601
 [push]
@@ -30,11 +29,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
+[format]
+	useAutoBase = true
+[include]
+	path = /home/stargrave/.git-safe