Merge remote-tracking branch 'rrussell/master'

This commit is contained in:
Carlos Cardoso 2012-10-25 15:56:36 -02:00
commit bc1e35d3b5
33 changed files with 914 additions and 26 deletions

View file

@ -1,7 +1,5 @@
# get the name of the branch we are on
function rvm_prompt_info() {
ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
echo "($ruby_version)"
[[ ! -z $ruby_version ]] && echo "($ruby_version)"
}