From: Linus Torvalds <torvalds@osdl.org>
Date: Sun, 08 Jan 2006 19:57:32 GMT
Subject: Re: git pull on Linux/ACPI release tree
Message-ID: <Pine.LNX.4.64.0601081156430.3169@g5.osdl.org>
In-Reply-To: <7vace61plu.fsf@assigned-by-dhcp.cox.net>



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