diff --git a/aliases b/aliases
index 3e15130..779c1b6 100644
--- a/aliases
+++ b/aliases
@@ -32,7 +32,7 @@ alias gdss="git diff --shortstat"
 alias gfa="git-date-added"
 alias gfl="git log --patch"
 alias gi="gitignore-io"
-alias gl="git lol"
+alias gl="git fancy-graph"
 alias gh="git hist"
 alias ghd="git hist-details"
 alias ght="git hist-tags"
@@ -51,6 +51,7 @@ alias grc="git rm --cached"
 alias grh="git reset --hard"
 alias grm="git rm"
 alias gs="git status"
+alias gu="git undo"
 alias gup="git branch --merged | egrep -v '(^\*|master|dev)' | xargs git branch -d"
 alias gw="git diff --check"
 alias Grep='grep'
diff --git a/gitconfig b/gitconfig
index c4ebd1d..9fc1763 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,6 @@
 [user]
-  name = Andrew Tomaka
   email = atomaka@gmail.com
+  name = Andrew Tomaka
   signingkey = 582BAC86
 [github]
   user = atomaka
@@ -8,34 +8,41 @@
 [apply]
   whitespace = fix
 [alias]
+  fancy-graph = log --graph --decorate --pretty=oneline --abbrev-commit
   hist = log --graph --pretty=format:'%Cred%h%Creset - %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
   hist-details = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
   hist-tags = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
-  lol = log --graph --decorate --pretty=oneline --abbrev-commit
   most-recent-by-branch = for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
+  undo = reset --soft HEAD^
 [color]
-    ui = auto
+  ui = auto
 [color "branch"]
   current = yellow reverse
   local = yellow
   remote = green
 [color "diff"]
-  meta = yellow bold
   frag = magenta
-  old = red
   new = green
+  old = red
+  meta = yellow bold
 [color "status"]
   added = yellow
   changed = green
   untracked = cyan
+[commit]
+  gpgsign = true
 [core]
-  excludesfile = ~/.gitignore_global
   autocrlf = input
   editor = vim
+  excludesfile = ~/.gitignore_global
   filemode = false
 [merge]
   tool = vimdiff
 [push]
   default = upstream
-[commit]
-  gpgsign = true
+[status]
+  showUntrackedFiles = all
+  # show all files instead of just directories
+[transfer]
+  fsckobjects = true
+  # https://groups.google.com/forum/#!topic/binary-transparency/f-BI4o8HZW0