X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=9d70461bf597eb5b4bbc0d73fd048c8095d1b395;hb=f332502b06f38162bef61d432743c203f1719f4a;hp=2abb7ec321c42d58d3881d0fb70c4e3c1c397148;hpb=b25e64154b9381049d20337e3f17609945e859bc;p=dotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index 2abb7ec..9d70461 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,8 +16,6 @@
 [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]
@@ -35,13 +33,21 @@
 	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