I really need to find a way to stop accidentally working on master

I solved this problem for myself, but I am command line pretty much all the time. So, my command line prompt includes the branch I am on if I am in a git folder.

11:28:28 ~/Dropbox/code/phalanx/src (T7014)

The parenthetical bit at the end is the branch name. Also, the time is teal, the path is yellow, and the branch is blue.

My .bash_profile is something like

source ~/Dropbox/code/bin/.git-prompt.sh

export PS1="\[\033]0;\w\007\]\\e]2;\u@\H\a\033[36m\]\t\[\033[m\] \[\033[33;1m\]\w\[\033[m\]\033[34m\]\$(__git_ps1)\[\033[m\]\n~> "
export PROMPT_COMMAND='echo -ne "\033]0;${PWD/#$HOME/~}\007"'

And git-prompt.sh is here

My messy workaround is to have this alias as gpop ("pop the most recent commit off and throw it away"):

#!/bin/sh

echo "Pop" `git log -n 1 --format='%H %s'`
git reset --hard HEAD^

Then I do:

$ git checkout -b feature # Move my stuff to a feature branch
$ git checkout master # Go back to master
$ gpop # Destroy my stuff on master

You could also do this instead of gpop:

$ git reset --hard origin/master

...but I use gpop often enough elsewhere to keep it around. For example, it's useful if you arc patch --nobranch something and then want to get rid of it.

I will try @btrahan's thing, though I sometimes have multiple Terminals open on different computers.