Suppose I have this feature branch "foo". Now I want to merge it back into master, but I've added some debugging code that I don't want in master. 

The debug code is in it's own commit, so I could use `git cherry-pick` on each commit and leave out this commit. But that's gonna be quite tiresome. 

Is there some "inverse cherry-pick" that does this, or an interactive merge?