Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Gaetan Semet 2014-01-18 12:09:59 +01:00
commit 43da92c071
3 changed files with 5 additions and 5 deletions

View file

@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
eval my_orange='$FG[214]'
# right prompt
PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
# git settings
ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"