Merge master

[rbdr/dotfiles] / gitconfig

diff --git a/gitconfig b/gitconfig
index 3be84dbf5b477d424e455643ade5b3ec6f056185..d426b5cdf804ba385baef942ae72418ef93ac891 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,7 +1,14 @@
 [user]
        name = Ben Beltran
        email = ben@nsovocal.com
 [user]
        name = Ben Beltran
        email = ben@nsovocal.com

+       signingkey = 8ABB89672AFB58F5

 [core]
        editor = vim
 [color]
        diff = auto
 [core]
        editor = vim
 [color]
        diff = auto

+[push]
+       default = simple
+[commit]
+       gpgsign = true
+[gpg]
+       program = gpg2