new alias "git when" for list of branches sorted by update time
Merge branch 'master' of github.com:tylerball/dotfiles

Conflicts:
	_gitconfig