Is it possible to exclude specific commits when doing a git merge?

I’ve found a solution that works for me in the Pro Git book.

Let’s say you want to exclude the file config.php.

On branch A:

1. Create a file named .gitattributes in the same dir, with this line: config.php merge=ours. This tells git what strategy to use when merging the file. In this case it always keep your version, ie. the version on the branch you are merging into.

2. Add the .gitattributes file and commit

On branch B: repeat steps 1-2

Try merging now. Your file should be left untouched.