Merge with upstream

Author: ogr3

README.md

@@ -110,10 +110,9 @@ cd ~
 git clone https://github.com/ogr3/bash-git-prompt.git .bash-git-prompt --depth=1
 ```
 
-Add to the `~/.bashrc`: 
+Add to the `~/.bashrc`:
 ```
   GIT_PROMPT_THEME=TruncatedPwd_WindowTitle
-  GIT_PROMPT_ONLY_IN_REPO=1
   source ~/.bash-git-prompt/gitprompt.sh
 ```
 

gitstatus_pre-1.7.10.sh

@@ -58,7 +58,7 @@ remote=
 upstream=
 
 if [[ -z "$branch" ]]; then
-  tag=$( git describe --branch --exact-match 2>/dev/null )
+  tag=$( git describe --tags --exact-match 2>/dev/null )
   if [[ -n "$tag" ]]; then
     branch="$tag"
   else