Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932764AbWAHT5q (ORCPT ); Sun, 8 Jan 2006 14:57:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161190AbWAHT5n (ORCPT ); Sun, 8 Jan 2006 14:57:43 -0500 Received: from smtp.osdl.org ([65.172.181.4]:9887 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S932761AbWAHT5m (ORCPT ); Sun, 8 Jan 2006 14:57:42 -0500 Date: Sun, 8 Jan 2006 11:57:32 -0800 (PST) From: Linus Torvalds To: Junio C Hamano cc: Martin Langhoff , "Brown, Len" , "David S. Miller" , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@osdl.org, git@vger.kernel.org Subject: Re: git pull on Linux/ACPI release tree In-Reply-To: <7vace61plu.fsf@assigned-by-dhcp.cox.net> Message-ID: References: <46a038f90601081119r39014fbi995cc8b6e95774da@mail.gmail.com> <7vace61plu.fsf@assigned-by-dhcp.cox.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 505 Lines: 15 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/