1 files changed, 6 insertions, 1 deletions
diff --git a/gitconfig b/gitconfig
index 69d3b0c..5bd3fbc 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,7 @@
 [user]
 	name = Karel Kočí
 	email = cynerd@email.cz
+	signingkey = A6BC8B8CEB31659B
 [push]
 	default = simple
 [core]
@@ -8,4 +9,8 @@
 [commit]
         gpgsign = true
 [merge]
-        tool = vimdiff
+	tool = vimdiff
+[pull]
+	ff = only
+[commit]
+	gpgSign = true