Re: Add --rebase option to git-pull?

From: Tom Clarke <tom@u2i.com>
Date: Aug 30, 2007, 13:17 UTC
Message-ID: <550f9510708300617y69352a67r818000273c25ce11@mail.gmail.com>
In-Reply-To: <46D6C12A.5090705@op5.se>

On 8/30/07, Andreas Ericsson <ae@op5.se> wrote:

Show 5 quoted lines

> If I read the patch correctly (which I may not, ofcourse), you're
> rebasing the upstream changes to on top of your own work. That's
> not something you can readily do, since the parentage chain in
> git is supposed to be immutable, so mutating the one you get from
> an already published source would be a horribly bad idea indeed.

It's intended to (and appears to) rebase on top of $merge_head, which would typically be something like origin/master or origin/topics/my_topic or something. I just noticed I don't need the $strategy_args which might be confusing.

> If that's what the patch does, then I guess all is fine and dandy,
> although I think it'd be better to add the merge-strategy rebase
> or possibly rebase-ours or rebase-theirs, which can be given as
> arguments to git-pull.

Ok, makes sense.

-Tom