Make `hotfix merge` use only one entire `Git::run_safe`

Add param to `submodules_update` that allows one to return a string of
the command rather than execute it.