From 6898becdeb56f90e25b87e0599b7fe12ab1d6bc1 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Mon, 29 Mar 2010 11:42:58 +0200
Subject: Add push merge and sendemail config, update gitk.

Both from fermion. Still need to find a way to get a machine specific
config.
---
 .gitconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to '.gitconfig')

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
-- 
cgit v1.2.3-54-g00ecf