From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Tue, 10 Jan 2006 20:33:11 GMT
Subject: Re: git pull on Linux/ACPI release tree
Message-ID: <46a038f90601101233h5def4840k315be9520796b5e@mail.gmail.com>
In-Reply-To: <20060110201909.GB3911@stusta.de>

On 1/11/06, Adrian Bunk <bunk@stusta.de> 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.

In that case, there's a mostly automated way of doing that if you read
the last couple lines of git-rebase, using something along the lines
of

      git-format-patch <yours> <linus> | git-am -3 -k

> I'd say the main problem is that git with several other projects like
> cogito and stg on top of it allow many different workflows. But finding
> the one that suits one's needs without doing something in a wrong way
> is non-trivial.

You are right about that, but much of the space (of what workflows are
interesting) is still being explored, and git and the porcelains
reacting to people's interests. So it's still a moving target. A fast
moving target.

cheers,


martin