[GIT] Re-arrange git aliases to match what they do
[GIT] Re-arrange git aliases to match what they do

Break up into adding, committing, merging, etc.

dylanpinn/dotfiles,dylanpinn/dotfiles,dylanpinn/dotfiles