Problem with prompt inside .git folders

git rev-parse gets all confused in .git folders. Just give up when there.
Merge pull request #2 from khwilson/master

Silly problem I ran into
Merge branch 'master' into knewton