Re: merge only some of the changed files?

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Mar 19, 2010, 13:55 UTC
Message-ID: <4BA3825E.1070700@drmicha.warpmail.net>
In-Reply-To: <20100319134028.GA2318@comppasch2>

fkater@googlemail.com venit, vidit, dixit 19.03.2010 14:40:

Show 9 quoted lines

> Hi all,
> 
> I am quite new to git.
> 
> If I want to merge branch B into A, however not all of the
> changed files in B, how do I do that?
> 
> In other words: 'git diff --name-only A..B' lists 10 files
> but I want to merge only 5 of them.

If you are sure you don't want to merge the changes to them later on, you can do the following while on branch A

# perform the merge but do not commit git merge --no-commit B # overwrite the files you want to keep with their version from A git checkout HEAD -- file1 file2 # commit the merge result git commit

Cheers, Michael