Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/npm/npm.plugin.zsh
This commit is contained in:
Gaetan Semet 2017-11-18 17:35:02 +08:00
commit 2d074f7cc9
50 changed files with 962 additions and 236 deletions

View file

@ -1,4 +1,4 @@
# ZSH Theme - Preview: http://img.skitch.com/20091113-qqtd3j8xinysujg5ugrsbr7x1y.jpg
# ZSH Theme - Preview: https://flic.kr/p/ZFvivf
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
PROMPT='%{$fg[green]%}%m%{$reset_color%} %2~ $(git_prompt_info)%{$reset_color%}%B»%b '