diff --git a/tools/vcs/git/gitconfig b/tools/vcs/git/gitconfig
index 14efe2a..7fa9b14 100644
--- a/tools/vcs/git/gitconfig
+++ b/tools/vcs/git/gitconfig
@@ -20,6 +20,7 @@
 
 [push]
 	default = simple
+	followTags = true
 
 [url "git@github.com:"]
 	insteadOf = gh:
@@ -27,3 +28,18 @@
 
 [github]
 	user = vbrandl
+
+[alias]
+	glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
+
+[format]
+	pretty = format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
+
+# A nice little github-like colorful, split diff right in the console.
+# via http://owen.cymru/github-style-diff-in-terminal-with-icdiff/
+[diff]
+	tool = icdiff
+[difftool]
+	prompt = false
+[difftool "icdiff"]
+	cmd = /usr/local/bin/icdiff --line-numbers $LOCAL $REMOTE