John,

I hadn’t thought of it, but yes. I should write that script that I mentioned.

I turned to Stack Overflow. It seems that this .gitattributes solution on StackOverflow might work: http://stackoverflow.com/questions/332528/is-it-possible-to-exclude-specific-commits-when-doing-a-git-merge/3970442#3970442