diff --git a/gitconfig b/gitconfig
index 89a163b..46db076 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,6 @@
 [user]
-    name = Eryn Wells
-    email = eryn@erynwells.me
+	name = Eryn Wells
+	email = eryn@erynwells.me
 [core]
     editor = vim
     quotepath = false
@@ -14,3 +14,8 @@
     ci = commit
     br = branch
     lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+    push = push -u
+[ui]
+	color = true
+[mergetool]
+	keepBackup = true