Tried it, for some reason isn't working on my system.

Then found this: http://volnitsky.com/project/git-prompt/ and I'm loving it!

There's a __git_ps1 function that's included with the git bash completion script (edit: it works with zsh, too -- the __git_ps1 function and the completion).