Adding git aliases for status and "merge --no-ff"