$ git show --decorate HEAD
commit e556e0462403d59d82fc0f23ea684a6fb7693c04 (HEAD, origin/basefarm-st)
Merge: 55ee8d3 e55316f
Author: fdahlin <fredrick.dahlin@gmail.com>
Date:   Sat May 2 16:08:07 2015 +0200

    Merge remote-tracking branch 'upstream/basefarm-st' into origin/basefarm-st