diff --git a/.gitconfig b/.gitconfig
index 3d5c45d..538e4ae 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,27 +1,22 @@
 [user]
-	name = Bodaniel Jeanes
-	email = me@bjeanes.com
+  name = Bodaniel Jeanes
+  email = me@bjeanes.com
 [merge]
-	summary = true
-
+  summary = true
+  tool = opendiff
+[alias]
+  co = checkout
+  put = push origin HEAD
+  push-all = "!for i in $(git config --list | grep -E ^remote\\..+\\.url | sed -E 's/^remote\\.(.*)\\.url=.*/\\1/'); do git push $i master; done"
+[apply]
+  whitespace = nowarn
 [color]
   branch = auto
   diff = auto
   status = auto
-[color "branch"]
-  current = yellow reverse
-  local = yellow
-  remote = green
-[color "diff"]
-  meta = yellow bold
-  frag = magenta bold
-  old = red bold
-  new = green bold
-[color "status"]
-  added = yellow
-  changed = green
-  untracked = cyan
 [github]
-	user = bjeanes
+  user = bjeanes
 [core]
-	editor = mate -w
+  editor = mate -w
+  excludesfile = ~/.gitignore
+