Better handling of git-prompt