[keybored]

Stacked Git (stg) will let you push and pop commits. Pop when publishing, push back when you need them again.