Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -22,6 +22,7 @@ RVM_THEME_PROMPT_SUFFIX='|'
|
|||||||
|
|
||||||
function scm {
|
function scm {
|
||||||
if [[ -d .git ]]; then SCM=$GIT
|
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 .hg ]]; then SCM=$HG
|
||||||
elif [[ -d .svn ]]; then SCM=$SVN
|
elif [[ -d .svn ]]; then SCM=$SVN
|
||||||
else SCM='NONE'
|
else SCM='NONE'
|
||||||
|
|||||||
Reference in New Issue
Block a user