I have made commits to my local branch (let\'s just say master) and have \'git pull\'d down changes that others have made. When I run a \'git status\', I see something like:
I tend to use gitk (or gitk --all) which will show this history of the branch. It also displays large friendly labels on origin/master and master (and any other tags that you have).