we have master and a branch, foo.

we have some commits in foo that we'd like to merge into master but there are also some commits that should not be merged.  what's one way to do this when their are lots of commits?

1. $git checkout -b tmp foo
2. $git rebase -i master
3. $git checkout master
4. $git merge tmp

After issuing 2, you'll have a text file to edit that list all commits.  Comments within the text file indicate how to edit it to your liking.