Re: git pull on Linux/ACPI release tree
From: Linus Torvalds <torvalds@osdl.org>
Date: 2006-01-08 19:57:46
Also in:
linux-acpi, lkml
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