summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--git/.gitconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 8c83c00..2416a7f 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,8 +1,12 @@
 [user]
 	email = mail@krinitsin.com
 	name = Christian Krinitsin
-	signingkey = <key-id>
+	signingkey = <key-id> 
 [pull]
 	rebase = true
 [commit]
 	gpgsign = true
+[core]
+	excludesfile = /home/chris/.gitignore
+[merge]
+	tool = nvimdiff