Merge branch 'prompt' into develop
This commit is contained in:
commit
aecf51721d
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue