Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Gaetan Semet 2016-07-13 15:02:34 +02:00
commit de9feed11b
29 changed files with 630 additions and 93 deletions

View file

@ -41,4 +41,10 @@ PROMPT='
%~
${smiley} %{$reset_color%}'
RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}'
if [[ -d ~/.rvm ]] && [[ -e ~/.rvm/bin/rvm-prompt ]]; then
rvm_prompt='$(~/.rvm/bin/rvm-prompt)'
else
rvm_prompt=''
fi
RPROMPT='%{$fg[white]%} $rvm_prompt$(git_prompt)%{$reset_color%}'