Merge remote-tracking branch 'upstream/master'

2011-03-06 18:09:32 +01:00 · 2011-03-06 18:09:32 +01:00 · 908e020a0b
parent 5f8e0c49d6 6dd943a23e
commit 908e020a0b
1 changed files with 1 additions and 0 deletions
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@ -22,6 +22,7 @@ RVM_THEME_PROMPT_SUFFIX='|'

 function scm {
  if [[ -d .git ]]; then SCM=$GIT
+  elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$GIT
  elif [[ -d .hg ]]; then SCM=$HG
  elif [[ -d .svn ]]; then SCM=$SVN
  else SCM='NONE'