autocommit-and-pull
after/during merge
Merge branch 'master' of https://github.com/xpaulz/workstations