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 /status.sh | |
parent | cc5719a05f754e4f42395dc09761d22510aeb4cf (diff) | |
download | evol-all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.tar.gz evol-all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.tar.bz2 evol-all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.tar.xz evol-all-a47ea35d4d872a389b792ecba9ebe05cae9b0243.zip |
Add into pull and status script checking for diverged branches.
Diffstat (limited to 'status.sh')
-rwxr-xr-x | status.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,7 +7,7 @@ function status { DIR=$(pwd) cd "$1" STR=$(git diff --stat --color=always) - STR2=$(git status|grep -E "Your branch is (behind|ahead)") + STR2=$(git status|grep -E "Your branch is (behind|ahead)")$(git status|grep -E "have diverged") STR3=$(git status -s -uno) if [[ "${CMD}" == "commit" || "${CMD}" == "c" ]]; then COMMIT=$(git rev-parse HEAD) |