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

@ -20,7 +20,7 @@ function git_changes_info() {
# Checks if working tree is dirty
function parse_git_dirty() {
local STATUS=''
local FLAGS
local -a FLAGS
FLAGS=('--porcelain')
if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
if [[ $POST_1_7_2_GIT -gt 0 ]]; then