gitmergeHow do you merge selective files with git-merge? - Stack Overflow
How do you merge selective files with git-merge? - Stack Overflow stackoverflow.com
Lots of options here (although merging files sounds like a bad bad plan - merging commits is probably more sane).