Add push merge and sendemail config, update gitk.

Both from fermion. Still need to find a way to get a machine specific
config.

2 files changed, 19 insertions, 7 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
diff --git a/.gitk b/.gitk
index a779a89..88c6ee4 100644
--- a/.gitk
+++ b/.gitk
@@ -16,14 +16,17 @@ set bgcolor white
 set fgcolor black
 set colors {green red blue magenta darkgrey brown orange}
 set diffcolors {red "#00a000" blue}
+set markbgcolor #e0e0ff
 set diffcontext 3
 set selectbgcolor gray85
 set extdifftool meld
-set geometry(main) 831x531+132+20
-set geometry(topwidth) 829
-set geometry(topheight) 180
-set geometry(pwsash0) "320 1"
-set geometry(pwsash1) "480 1"
-set geometry(botwidth) 400
-set geometry(botheight) 339
+set perfile_attrs 0
+set geometry(main) 1280x921+0+0
+set geometry(state) normal
+set geometry(topwidth) 1276
+set geometry(topheight) 410
+set geometry(pwsash0) "440 2"
+set geometry(pwsash1) "661 2"
+set geometry(botwidth) 551
+set geometry(botheight) 491
 set permviews {}