[jsharpe]

Honestly though, if you're doing that you should be using two different branches. Which is another thing git is wonderful for.