Re: git pull on Linux/ACPI release tree

From: Andreas Ericsson <ae@op5.se>
Date: Jan 11, 2006, 00:26 UTC
Message-ID: <43C450CF.8070102@op5.se>
In-Reply-To: <46a038f90601101233h5def4840k315be9520796b5e@mail.gmail.com>

Martin Langhoff wrote:

Show 13 quoted lines

> 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
>

Isn't this rebase in a nutshell ?

Show 12 quoted lines

> 
>>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.
>

Good thing there are competent people around to snipe those targets in mid-stride. :)

I for one was amazed at how much easier git was to work with than any of the other scm's I've tried (quite a few, I never really liked any of them), and I really like the fact that it's flexible enough to suit (almost) all our needs. The only thing I haven't really found it to be satisfactory for is our collection of RPM spec-files and their respective patches, where we not so much change files as continuously replace them completely. Perhaps that's changed now that most git-commands can be run from subdirs.

So, kudos to Linus for inventing it, Junio for nursing it, and the other 129 developers that have so far contributed to the current release.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231