Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932529AbWAIGN5 (ORCPT ); Mon, 9 Jan 2006 01:13:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751476AbWAIGN5 (ORCPT ); Mon, 9 Jan 2006 01:13:57 -0500 Received: from smtp.osdl.org ([65.172.181.4]:53403 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1751043AbWAIGNz (ORCPT ); Mon, 9 Jan 2006 01:13:55 -0500 Date: Sun, 8 Jan 2006 22:13:49 -0800 (PST) From: Linus Torvalds To: Martin Langhoff cc: "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: <46a038f90601082208i95cd19fmda542da0da8cc9ef@mail.gmail.com> Message-ID: References: <46a038f90601082208i95cd19fmda542da0da8cc9ef@mail.gmail.com> 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: 470 Lines: 15 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 - 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/