diff --git a/gitconfig b/gitconfig
index 29544e7..8b47271 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,62 +1,40 @@
 [user]
 	name = Tobias Schmidl
-
-[alias]
-	author = !git-author
-	unique-author = !git-unique-author
-	bdiff = !git --no-pager diff
-
-[url "https://"]
-	insteadOf = http://
-
-[diff "image"]
-	command = /home/schtobia/bin/imgdiff
-
-[rebase]
-	autoSquash = true
-
-[credential]
-	helper = store
-
-[diff]
-	renames = copies
-	renameLimit = 65536
-
-[http]
-	sslCAPath = /etc/ssl/certs
-	sslVerify = true
-	sslversion = tlsv1.2
-	#sslVersion = tlsv1.2
-
-[merge]
-	renormalize = true
-	conflictstyle = diff3
-
-[pack]
-	threads = 0
-
-[pull]
-	rebase = true
-
-[branch "master"]
-	rebase = true
-
-[core]
-	autocrlf = input
-
-[gitflow "branch"]
-	master = stable
-	develop = master
-
-[gitflow "prefix"]
-	feature = dev/
-
 [branch]
 	autosetuprebase = always
+[branch "master"]
+	rebase = true
+[core]
+	autocrlf = input
+	whitespace = trailing-space,tab-in-ident,indent-with-non-tab,space-before-tab,tabwidth=4
+[credential]
+	helper = store
+[diff]
+	renamelimit = 65536
+	renames = copies
+[gitflow "branch"]
+	develop = master
+	master = stable
+[gitflow "prefix"]
+	feature = dev/
+[http]
+	sslverify = true
+	sslversion = tlsv1.2
+[merge]
+	conflictstyle = diff3
+	renormalize = true
+[pack]
+	threads = 0
+[pull]
+	rebase = true
+[rebase]
+	autosquash = true
+[url "https://"]
+	insteadof = http://
 [tig]
+	blob-view = line-number:yes,interval=5 text
 	line-graphics = utf-8
 	tab-size = 4
-	blob-view = line-number:yes,interval=5 text
 [filter "lfs"]
 	required = true
 	clean = git-lfs clean -- %f