From: Greg KH <greg@kroah.com>
Date: Thu, 12 Jan 2006 01:37:06 GMT
Subject: Re: git pull on Linux/ACPI release tree
Message-ID: <20060112013706.GA3339@kroah.com>
In-Reply-To: <20060110201909.GB3911@stusta.de>

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