Tidy up git aliases
Fix problem with alias, replace with functions