chris@chris-desktop:~/hyperserv$ git branch -a
  commands
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/commands
  remotes/origin/cubescript
  remotes/origin/edit-packets
  remotes/origin/editmute
  remotes/origin/heatmap
  remotes/origin/master
  remotes/origin/ssh
  remotes/upstream/cubescript
  remotes/upstream/edit-packets
  remotes/upstream/editmute
  remotes/upstream/heatmap
  remotes/upstream/master
  remotes/upstream/ssh
chris@chris-desktop:~/hyperserv$ git log
commit 1ac714a7df0499845c2b0adcf22ab9e3f3db1e60
Author: chris0076 <socom_man0076@yahoo.com>
Date:   Mon Apr 25 22:37:11 2011 -0400

    Some more updates to the readme to make it easier to read.

commit 3707caef83f92c4025df96b9ea89cfad2805a12a
Author: chris0076 <socom_man0076@yahoo.com>
Date:   Sun Apr 24 17:22:37 2011 -0400

    Added some more information to the README.

commit f6a85325f353b26a4e21cb566408ec651836d8ed
Merge: d21b9d3 87beada
Author: chris0076 <socom_man0076@yahoo.com>
Date:   Sat Mar 26 15:34:23 2011 -0400

    Merge branch 'master' of github.com:chris0076/hyperserv

commit d21b9d3b45c7b271bf392ba5b2c493e565367a10
Author: chris0076 <socom_man0076@yahoo.com>
Date:   Sat Mar 26 15:32:41 2011 -0400

chris@chris-desktop:~/hyperserv$  git fetch upstream
chris@chris-desktop:~/hyperserv$ git checkout -b heatmap upstream/heatmap
error: You have local changes to 'src/pyscripts/plugins/irc.py'; cannot switch branches.
chris@chris-desktop:~/hyperserv$