Use `rebase-origin` consistently

* Replace `<>` style code comments with sentence instructions.
Encourage the use of `git add --patch` via `g ap`