On 8/30/07, Andreas Ericsson <ae@xxxxxx> wrote: > 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
