diff --git a/gitconfig b/gitconfig.client
similarity index 78%
rename from gitconfig
rename to gitconfig.client
index 8115988..231e6db 100644
--- a/gitconfig
+++ b/gitconfig.client
@@ -1,11 +1,3 @@
-[user]
-	name = Tobias Schmidl
-	email = T.Schmidl@erhardt-leimer.com
-	signingkey = 0xa1554441
-[gui]
-	fontdiff = -family \"Source Code Pro\" -size 8 -weight normal -slant roman -underline 0 -overstrike 0
-	fontui = -family \"DejaVu Sans\" -size 9 -weight normal -slant roman -underline 0 -overstrike 0
-	spellingdictionary = en
 [alias]
 	st = status
 	ci = commit
@@ -13,18 +5,32 @@
 	wdi = diff --color-words
 	co = checkout
 	up = fetch --all
+
 [color]
 	ui = auto
-[core]
-	excludesfile = /home/schtobia/.gitignore
-[push]
-	default = upstream
-[branch "master"]
-	rebase = true
-[pull]
-	rebase = true
+
 [diff]
 	renames = copies
+
+[gui]
+	fontdiff = -family \"Source Code Pro\" -size 8 -weight normal -slant roman -underline 0 -overstrike 0
+	fontui = -family \"DejaVu Sans\" -size 9 -weight normal -slant roman -underline 0 -overstrike 0
+	spellingdictionary = en
+
+# recognize file copies
+[diff]
+	renames = copies
+
+[push]
+	default = upstream
+
+[branch "master"]
+	rebase = true
+
+[pull]
+	rebase = true
+
 [http]
 	sslCAPath = /etc/ssl/certs
 	sslVerify = true
+
diff --git a/gitconfig.server b/gitconfig.server
new file mode 100644
index 0000000..dcefd31
--- /dev/null
+++ b/gitconfig.server
@@ -0,0 +1,36 @@
+[http]
+	sslCAPath = /etc/ssl/certs # System CA path
+	sslVerify = true           # make sure that https requests get verified
+
+# some system aliases
+[alias]
+	st = status
+	ci = commit
+	di = diff
+	wdi = diff --color-words
+	co = checkout
+	up = fetch --all
+
+# default push destination
+[push]
+	default = upstream
+
+# try rebase whenever possible
+[branch "master"]
+	rebase = true
+
+# try rebase whenever possible
+[pull]
+	rebase = true
+
+# recognize file copies
+[diff]
+	renames = copies
+
+# allow writing by all users in the same group
+[core]
+	sharedRepository = group
+
+# deny ununsual write options
+[receive]
+	denyNonFastForwards = true