From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 09 Jun 2009 19:35:58 GMT
Subject: Re: Git merge selective files
Message-ID: <81b0412b0906091235g7a65d076l145c3eb3cbbdce3@mail.gmail.com>
In-Reply-To: <34b359190906090253v653ecc71q6684f4ebff2be59d@mail.gmail.com>

2009/6/9 joe higton <draxil@gmail.com>:
> Hi,
>     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?

Generally - no. But you can have a merge with only the content
of your choice:

  git merge -s ours --no-commit other

then copy the changes you need manually, and commit.
See the manpage of git merge about "ours" merge strategy.