summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 4d99310..b440eb8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,3 +23,12 @@
[color "diff"]
whitespace = red reverse
+
+[push]
+ default = matching
+
+[merge]
+ tool = vimdiff
+
+[sendemail]
+ smtpserver = smtp.zhaw.ch