summaryrefslogtreecommitdiff
path: root/git/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'git/.gitconfig')
-rw-r--r--git/.gitconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 0e7df50..79e64f8 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -4,7 +4,7 @@
[user]
name = Urbain Vaes
email = urbain@vaes.uk
- signingKey = 716064C0
+ ; signingKey = 716064C0
[init]
templatedir = ~/.git_template
[alias]
@@ -13,9 +13,11 @@
[http]
sslverify = false
[commit]
- gpgSign = true
+ ; gpgSign = true
verbose = true
[push]
default = simple
[merge]
ff = true
+[pull]
+ rebase = false