Move git command aliases to the same place in the source code
Update usage for git aliases and rename a variable