diff --git a/.gitconfig b/.gitconfig
index c0eb926..552d10c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,16 +5,20 @@
 	email = robert.r.kmiec@gmail.com
 [core]
 	editor = vim
+	pager = diff-so-fancy | less --tabs=4 -RFX
+	autocrlf = false
 [help]
 	autocorrect = 1
 [color]
 	ui = true
 [grep]
-	lineNumber = true
+	linenumber = true
 [sendemail]
 	smtpencryption = tls
 	smtpserver = smtp.gmail.com
 	smtpuser = robert.r.kmiec@gmail.com
 	smtpserverport = 587
+[diff]
+	tool = vimdiff
 [merge]
 	tool = vimdiff