git prompt - fixed to work when not in work tree.
Merge branch 'master' into sistemi