Re: [PATCH] rebase: use @{upstream} if no upstream specified

[Jonathan Nieder <jrnieder@gmail.com>]

Martin von Zweigbergk wrote:

> Maybe something like this on top? I put it in git-parse-remote.sh for
> now.

Thanks.  That sounds like a good place.

> Changes to the text compared to before:
>
>  * "remote branch" became "upstream branch", even for git pull

Sensible for pull --rebase.  I'm not so sure about plain pull --- what
if I am upstream and pulling from downstream?

>  * "You asked me to pull" became "You asked me to merge" or "You asked
>    me to rebase", even for git pull

"To pull" would be clearer if the reader is new and unfamiliar with
the details.

>  * Now printed to stderr, because I simply didn't think about it. Good
>    or bad?

If this were a new message, I'd say stderr is better.

As is, the change to stderr seems relatively harmless, though I haven't
thought about it deeply.  But a part of me likes to see functional
changes isolated in separate commits to make tracking down bugs a
little easier.

Hope that helps,
Jonathan