shell: git: add gm for git merge
Merge branch 'master' of https://github.com/adamcstephens/dotfiles