Always rebase interactively with rebase-origin

There are two use cases for `rebase-origin` during our normal workflow:

1) Rebase frequently to incorporate upstream changes:

    g rebase-origin
    <resolve conflicts>

2) Pre-merge, squash commits like "Fix whitespace" into a small number
of valuable commit(s). Edit commit messages to reveal intent.

    g rebase-origin
    rake