added missing aliases, added .gitconfig