Refactor some git aliases

The reason behind this refactor is so that git autocompletions
continue to work with the aliases. Gary Bernhardt's way would break
autocompleation.