diff --git a/.gitconfig b/.gitconfig
index 5f4e981..23b9471 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,16 +1,34 @@
 [user]
-		name = Michael Grote
-		email = michael.grote@posteo.de
+name               = Michael Grote
+email              = michael.grote@dataport.de
+signingKey         = D9EC9A33
 [credential]
-		helper = store
+helper             = store
 [alias]
-		remote = remote -v
-		c = checkout
+remote             = remote -v
 [core]
-		editor = vim
+autocrlf           = input
+whitespace         = blank-at-eol,space-before-tab,blank-at-eof
 [help]
-		autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
+autocorrect        = 20 # https://opensource.com/article/20/11/git-aliases
+[status]
+showUntrackedFiles = all
+[push]
+default            = simple
+[pull]
+rebase             = true
 [merge]
-		conflictStyle = diff3
+conflictStyle      = diff3
+[diff]
+renames            = true
+[fetch]
+prune              = true
+[commit]
+gpgsign            = true
+[gpg]
+program            = gpg2
 [safe]
-	  directory = ~/dotfiles
+directory          = ~/dotfiles
+[advice]
+addIgnoredFile     = true
+addEmptyPathspec   = false