Reworked git aliases into one file