From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 09 Jun 2009 19:39:31 GMT
Subject: Re: Git merge selective files
Message-ID: <32541b130906091239x1c92a1caxd260983a66e8025f@mail.gmail.com>
In-Reply-To: <4A2EB575.8050107@workspacewhiz.com>

On Tue, Jun 9, 2009 at 3:18 PM, Joshua Jensen<jjensen@workspacewhiz.com> wrote:
> 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?
>
> I like this one:
>
> http://jasonrudolph.com/blog/2009/02/25/git-tip-how-to-merge-specific-files-from-another-branch/

Careful... that *replaces* the files with the ones from the branch.
It doesn't *merge* them.  Although that may be exactly what you want.

And the "'merge --squash' and don't commit the changes you don't want"
option looks okay to me too.

Avery