From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 09 Jun 2009 18:32:14 GMT
Subject: Re: Git merge selective files
Message-ID: <32541b130906091132sc5a647cn5fe0289ff9793cc3@mail.gmail.com>
In-Reply-To: <34b359190906090253v653ecc71q6684f4ebff2be59d@mail.gmail.com>

On Tue, Jun 9, 2009 at 5:53 AM, joe higton<draxil@gmail.com> wrote:
>     I want to merge changes from a branch but only to one file, I
> don't want to pick up the changes from other files. I've scoured
> google and the docs a bit but I can't find anything useful. Is this
> possible?

You might want to try just using

    git diff old-version new-version | patch -p1

(where old-version and new-version are the appropriate commit ids or
branch names or whatever)

And then committing the results.

Have fun,

Avery