stonewareslord/omg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix style

Browse Source
This commit is contained in:
Yehor Lvivski 2013-11-06 15:48:23 +02:00
parent 80db87d4de
commit 7e7bb9a334
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
prompt.sh
View File

@ -50,7 +50,7 @@ function build_prompt {
yellow="\[\033[0;33m\]"
violet="\[\033[0;35m\]"
branch_color="\[\033[0;34m\]"
# blinking="\[\033[1;5;17m\]"
#blinking="\[\033[1;5;17m\]"
reset="\[\033[0m\]"
# Git info
@ -103,10 +103,10 @@ function build_prompt {
commits_behind=$(git log --pretty=oneline --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^>" )
if [ ${commits_ahead} -gt 0 -a ${commits_behind} -gt 0 ]; then
has_diverged=true
as_diverged=true
fi
if [ ${commits_ahead} -eq 0 -a ${commits_behind} -gt 0 ]; then
can_fast_forward=true
can_fast_forward=true
fi
will_rebase=$(git config --get branch.${current_branch}.rebase 2>/dev/null)
@ -133,7 +133,7 @@ function build_prompt {
enrich ${detached} "${detached_symbol}" "${red}"
if [[ ${display_has_upstream} == true ]]; then
enrich ${has_upstream} "${has_upstream_symbol}"
enrich ${has_upstream} "${has_upstream_symbol}"
fi
if [[ ${detached} == true ]]; then
if [[ ${just_init} == true ]]; then