o Update gitconfig with aliases for checkout, clean -fd and log.
Merge remote-tracking branch 'origin/master'