aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2016-08-23 22:46:36 +0200
committerKarel Kočí <cynerd@email.cz>2016-08-23 23:01:22 +0200
commit936e17a9d819a6f55bec09eafd1beec523dcaa64 (patch)
tree8dc4bafcd7453879924fb89cbe06ba6d63fdb700 /gitconfig
parentb5fdc60edacabf99dff16f04ff2c7618f2233977 (diff)
downloadmyconfigs-936e17a9d819a6f55bec09eafd1beec523dcaa64.tar.gz
myconfigs-936e17a9d819a6f55bec09eafd1beec523dcaa64.tar.bz2
myconfigs-936e17a9d819a6f55bec09eafd1beec523dcaa64.zip
Add newmail-notify and some other small tweaks
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig7
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