Currently, merging a local branch requires specifying --local. This
ended up being a bit more work than wanted for the average user.

Now, --local is the default unless both -r is used and a specific branch
is not specified. This means that if you're just landing a remote change
using -r, it will land correctly as before, but if you're trying to land
the current branch (without specifying -r) or landing a specified
branch, it will assume it's local and doesn't need to be patched.

Tested landing a local branch without having to specify --local. Worked fine.
There are larger problems landing remote patches. I'll have a separate change up

for that.