edit aliases
Merge branch 'update-gitconfig-1'