Add currbranch alias, refactor incoming, add set-upload push alias