Re: Git merge selective files

On Tue, Jun 9, 2009 at 3:18 PM, Joshua Jensen[off-list ref] wrote:

On Tue, Jun 9, 2009 at 5:53 AM, joe higton[off-list ref] wrote:

quoted

    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