1 files changed, 4 insertions, 0 deletions

diff --git a/gitconfig b/gitconfig
index 59fe735..69d3b0c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,3 +5,7 @@
 	default = simple
 [core]
 	editor = vim
+[commit]
+        gpgsign = true
+[merge]
+        tool = vimdiff