Use signal names in the trap command.
Add a new script: git-upstream-brdiff.

This is a script which is probably only useful to someone with my
specific workflow, where feature/bugfix branches are created off a
development branch and I try to merge as often as possible.
Merge branch 'master' of github.com:markjdb/scripts