summaryrefslogtreecommitdiff
path: root/pull.sh
diff options
context:
space:
mode:
Diffstat (limited to 'pull.sh')
-rwxr-xr-xpull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pull.sh b/pull.sh
index 68c1f93..2362ae4 100755
--- a/pull.sh
+++ b/pull.sh
@@ -13,7 +13,7 @@ function status {
return
fi
STR=$(git diff --name-only)
- STR2=$(git status|grep "Your branch is ahead")
+ STR2=$(git status|grep "Your branch is ahead")$(git status|grep -E "have diverged")
STR3=$(git status -s -uno)
if [[ -n "${STR}${STR2}${STR3}" ]]; then
echo -e "\e[1;31mCant pull because changes not pushed\e[0m"