Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030455AbWALQAg (ORCPT ); Thu, 12 Jan 2006 11:00:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030444AbWALQAg (ORCPT ); Thu, 12 Jan 2006 11:00:36 -0500 Received: from mail.kroah.org ([69.55.234.183]:52945 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S1030451AbWALQAd (ORCPT ); Thu, 12 Jan 2006 11:00:33 -0500 Date: Wed, 11 Jan 2006 17:37:06 -0800 From: Greg KH To: Adrian Bunk Cc: Linus Torvalds , "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 Message-ID: <20060112013706.GA3339@kroah.com> References: <20060108230611.GP3774@stusta.de> <20060110201909.GB3911@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060110201909.GB3911@stusta.de> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 625 Lines: 17 On Tue, Jan 10, 2006 at 09:19:09PM +0100, Adrian Bunk wrote: > > I am using the workaround of carrying the patches in a mail folder, > applying them in a batch, and not pulling from your tree between > applying a batch of patches and you pulling from my tree. Ick, I'd strongly recommend using quilt for this. It works great for just this kind of workflow. thanks, greg k-h - 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/