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

diff --git a/git/.gitconfig b/git/.gitconfig
index b3d796f..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
@@ -33,10 +33,12 @@
 	colorMoved = default
 	colorMovedWS = allow-indentation-change
 	tool = vimdiff
+	noprefix = true
 [grep]
 	lineNumber = true
 [merge]
 	tool = vimdiff
+	conflictStyle = zdiff3
 [pull]
 	ff = only
 [help]
@@ -45,3 +47,7 @@
 	defaultBranch = master
 [format]
 	useAutoBase = true
+[safe]
+	directory = *
+[includeIf "gitdir:~/work/stc/"]
+	path = ~/work/stc/.gitconfig