git checkout -b -t

Hey all,

  I've become the "guy to ask about git" in my company and people are
always getting into a mess with git.  So in turn I try to get git to
be a more friendly.  Today someone had a problem.  Basically they had
done:

$ git checkout -t origin/mybranch
fatal: git checkout: --track and --no-track require -b

So they do exactly what it tells them:
$ git checkout -b -t origin/mybranch
Switched to a new branch "-t"

doh

How can we make this less easy for people to shoot themselves in the
foot?  The behavior of -t has changed recently iirc, so I think that
problem has gone away?

Also:
$ git branch -D -t

Doesn't work.  I can see why, but it does make my life difficult :-D

John