linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-22 04:51:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
lib/git.zsh
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