fkater@xxxxxxxxxxxxxx venit, vidit, dixit 19.03.2010 14:40: > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html