Merge pull request #3 from lvivski/master

fix typo
2013-11-06 06:26:04 -08:00 · 2013-11-06 06:26:04 -08:00 · 67f2aec5b4
commit 67f2aec5b4
parent ec0d72f1af fc6dbcffb3
1 changed files with 1 additions and 1 deletions
--- a/prompt.sh
+++ b/prompt.sh
@ -103,7 +103,7 @@ 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
-			as_diverged=true
+			has_diverged=true
 		fi
 		if [ ${commits_ahead} -eq 0 -a ${commits_behind} -gt 0 ]; then
 			can_fast_forward=true