Merge branch 'prompt' into develop

This commit is contained in:
Jephte CLAIN 2014-01-27 18:16:14 +04:00
commit aecf51721d
1 changed files with 2 additions and 4 deletions

View File

@ -40,10 +40,8 @@ if [ -n "$UTOOLS" ]; then
else
flag="git"
fi
if [ "$UTOOLS" == "f" ]; then
branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
[ "$branch" != "master" ] && flag="$flag:$branch"
fi
branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
[ "$branch" != "master" ] && flag="$flag:$branch"
if [ -n "$NOPUSH" ]; then
flag="$flag,nopush"
fi