diff --git a/.gitconfig b/.gitconfig
index 4e799bb..2049b16 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,19 +1,19 @@
 [user]
 	name = Craige McWhirter
 	email = craige@mcwhirter.io
-	email = craige.mcwhirter@iohk.io
 	signingkey = 0x7E66C3B5CDE94A4A
+[includeIf "gitdir:~/source/IOHK/"]
+	path = ~/source/IOHK/.gitconfig
 [push]
 	default = simple
 [gitreview]
 	username = craige
 
 [url "git+ssh://USER@git.launchpad.net/"]
-    insteadof = lp:
+  insteadof = lp:
 [commit]
 	gpgsign = true
 [color]
 	ui = always
-#[includeIf "gitdir:~/source/IOHK/"]
-#    path = ~/.gitconfig-iohk
-
+[pull]
+	rebase = true