diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-12-28 12:03:20 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-12-28 12:03:20 +0300 |
commit | a47ea35d4d872a389b792ecba9ebe05cae9b0243 (patch) | |
tree | a378e728c2f1d96477a8b1f79e1fdfe3831df005 /pull.sh | |
parent | cc5719a05f754e4f42395dc09761d22510aeb4cf (diff) | |
download | all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.tar.gz all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.tar.bz2 all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.tar.xz all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.zip |
Add into pull and status script checking for diverged branches.
Diffstat (limited to 'pull.sh')
-rwxr-xr-x | pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |