On Sun, 8 Jan 2006, Junio C Hamano wrote: > > Careful. I do not think rebase works across merges at all.
Right. You have to do one or the other (rebase your changes to another
tree _or_ merge another tree into your changes), but not mix the two.
Linus
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
