Merge branch 'skip-option' into pu

* branch skip-option:
  WIP
  Add --skip option

Needs more work to be able to handle "branch not found".
Merge branch 'status-fixes' into pu

* branch status-fixes:
  status_merge: mark a few more variables "local"

A few tweaks to the "--status" code.