Re: tracking branch for a rebase

On Fri, Sep 04, 2009 at 04:31:57PM +0200, Michael J Gruber wrote:

Making [rebase against upstream] the default for rebase without
arguments may meet some objections (oh no, I didn't mean to rebase),
but I guess it's worth trying.

FWIW, that has been a patch I have been meaning to do for a while. I
don't see it as any more error-prone than "git pull" without arguments.
In either case, you can always recover with a reset from the reflog.

The biggest question is whether it should respect branch.*.merge, or
just branch.*.rebase (I never use the latter simply because I never use
"git pull", but I think it is probably reasonable to restrict it to
cases where you said you are interested in rebasing in general).

-Peff