Add new git aliases, and remove unused ones