summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitconfig-exolobe14
1 files changed, 3 insertions, 1 deletions
diff --git a/gitconfig-exolobe1 b/gitconfig-exolobe1
index d0f14b7..e76a7ee 100644
--- a/gitconfig-exolobe1
+++ b/gitconfig-exolobe1
@@ -3,7 +3,7 @@
email = liw@liw.fi
signingkey = 44E17740B8611E9C
[commit]
- gpgSign = true
+ gpgSign = false
template = /home/liw/liw-dot-files/git-commit-template
[core]
excludesfile = /home/liw/.git-global-ignore
@@ -15,6 +15,8 @@
pushInsteadOf = git://gitorious.org/
[color]
ui = auto
+[pull]
+ ff = only
[push]
default = simple
[sendemail]