diff --git a/gitconfig b/gitconfig
index 6e7dd115..54db6a99 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,47 +1,44 @@
 [user]
-    name = Henrik Lissner
-    email = henrik@lissner.net
+	name = Henrik Lissner
+	email = henrik@lissner.net
 [github]
-    user = hlissner
+	user = hlissner
 [core]
-    excludesfile = ~/.gitignore
-    whitespace = trailing-space
-    editor = vim
-    pager = less -r
+	excludesfile = ~/.gitignore
+	whitespace = trailing-space
+	editor = vim
+	pager = less -r
 [color]
-    ui = true
+	ui = true
 [diff]
-    tool = vimdiff
+	tool = vimdiff
 [difftool]
-    prompt = false
+	prompt = false
 	cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
 [difftool "ediff"]
 	cmd = emacsclient -n --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
 [merge]
-    # Include summaries of merged commits in newly created merge commit messages
-    log = true
-    tool = vimdiff
+	# Include summaries of merged commits in newly created merge commit messages
+	log = true
+	tool = vimdiff
 [push]
-    default = simple
+	default = simple
 [credential]
-    helper = osxkeychain
+	helper = osxkeychain
 [alias]
 	root = rev-parse --show-toplevel
-    undo-commit = reset --soft "HEAD^"
-    amend = commit --amend
-    ls = ls-files
-    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
-    unadd = reset HEAD
-    st = status
-    co = checkout
-    ci = commit
-    di = diff
-    dc = diff --cached
-    ammend = commit --amend
-    pu = push -u
+	undo-commit = reset --soft "HEAD^"
+	amend = commit --amend
+	ls = ls-files
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
+	unadd = reset HEAD
+	st = status
+	co = checkout
+	ammend = commit --amend
+	exec = "!exec "
 
-    # data analysis
-    authors = !git log --format="%aN" | sort -u
-    ranked-authors = !git authors | sort | uniq -c | sort -n
-    emails = !git log --format="%aE" | sort -u
-    email-domains = !git log --format="%aE" | awk -F'@' '{print $2}' | sort -u
+	# data analysis
+	authors = !git log --format="%aN" | sort -u
+	ranked-authors = !git authors | sort | uniq -c | sort -n
+	emails = !git log --format="%aE" | sort -u
+	email-domains = !git log --format="%aE" | awk -F'@' '{print $2}' | sort -u