From: Linus Torvalds <torvalds@osdl.org>
Date: Mon, 09 Jan 2006 06:13:49 GMT
Subject: Re: git pull on Linux/ACPI release tree
Message-ID: <Pine.LNX.4.64.0601082212420.3169@g5.osdl.org>
In-Reply-To: <46a038f90601082208i95cd19fmda542da0da8cc9ef@mail.gmail.com>



On Mon, 9 Jan 2006, Martin Langhoff wrote:
> 
> and if it does anything but a very trivial merge, backtrack and do a merge.

To be fair, backtracking a "git-rebase" isn't obvious. One of the 
downsides of rebasing.

		Linus