Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Gaetan Semet 2014-12-23 16:51:46 +01:00
commit 1611be25ff
30 changed files with 239 additions and 151 deletions

View file

@ -87,7 +87,7 @@ function git_prompt_long_sha() {
git_prompt_status() {
INDEX=$(command git status --porcelain -b 2> /dev/null)
STATUS=""
if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
fi
if $(echo "$INDEX" | grep '^A ' &> /dev/null); then