summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitconfig5
-rw-r--r--.gitk15
2 files changed, 14 insertions, 6 deletions
diff --git a/.gitconfig b/.gitconfig
index 43d0de7..2c864f2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -31,5 +31,10 @@
[merge]
tool = vimdiff
+[grep]
+ lineNumber = true
+
[sendemail]
smtpserver = smtp.zhaw.ch
+ suppresscc = self
+ bcc = Tobias Klauser <tklauser@distanz.ch>
diff --git a/.gitk b/.gitk
index 88c6ee4..ae8776d 100644
--- a/.gitk
+++ b/.gitk
@@ -9,9 +9,12 @@ set cmitmode patch
set wrapcomment none
set autoselect 1
set showneartags 1
+set hideremotes 0
set showlocalchanges 1
set datetimeformat {%Y-%m-%d %H:%M:%S}
set limitdiffs 1
+set uicolor grey85
+set want_ttk 1
set bgcolor white
set fgcolor black
set colors {green red blue magenta darkgrey brown orange}
@@ -21,12 +24,12 @@ set diffcontext 3
set selectbgcolor gray85
set extdifftool meld
set perfile_attrs 0
-set geometry(main) 1280x921+0+0
+set geometry(main) 1280x920+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 geometry(topheight) 219
+set geometry(pwsash0) "611 2"
+set geometry(pwsash1) "706 2"
+set geometry(botwidth) 714
+set geometry(botheight) 681
set permviews {}