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

@ -9,6 +9,13 @@ export ZSH=$HOME/.oh-my-zsh
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="stibbons"
# Set list of themes to load
# Setting this variable when ZSH_THEME=random
# cause zsh load theme from this variable instead of
# looking in ~/.oh-my-zsh/themes/
# An empty array have no effect
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
@ -51,7 +58,9 @@ DISABLE_AUTO_UPDATE="true"
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(git)
plugins=(
git
)
zstyle ':completion:*:descriptions' format '%B%d%b'
source $ZSH/oh-my-zsh.sh