Messages in this thread | | | Date | Sun, 8 Jan 2006 11:57:32 -0800 (PST) | From | Linus Torvalds <> | Subject | Re: git pull on Linux/ACPI release tree |
| |
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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |