modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'prompt' into develop

This commit is contained in:
Jephte CLAIN 2014-01-27 18:16:14 +04:00
parent 8ff8b1e809 cae95416a2
commit aecf51721d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/profile.d/bash_prompt
View File

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