Maybe create a shell alias which would act as a wrapper around git to do just that, when you try to commit on the wrong branch