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

Merge pull request #3 from lvivski/master

Browse Source 
fix typo
This commit is contained in:
Arialdo Martini 2013-11-06 06:26:04 -08:00
commit 67f2aec5b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prompt.sh
View File

@ -103,7 +103,7 @@ function build_prompt {
commits_behind=$(git log --pretty=oneline --topo-order --left-right ${current_commit_hash}...${upstream} | grep -c "^>" ) 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 if [ ${commits_ahead} -gt 0 -a ${commits_behind} -gt 0 ]; then
as_diverged=true has_diverged=true
fi fi
if [ ${commits_ahead} -eq 0 -a ${commits_behind} -gt 0 ]; then if [ ${commits_ahead} -eq 0 -a ${commits_behind} -gt 0 ]; then
can_fast_forward=true can_fast_forward=true