Merge remote-tracking branch 'upstream/master'

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>

# Conflicts:
#	plugins/npm/npm.plugin.zsh
This commit is contained in:
Gaetan Semet 2017-11-28 23:09:48 +01:00
commit 95391749ab
50 changed files with 957 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 '