summaryrefslogtreecommitdiff
path: root/status.sh
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-28 12:03:20 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-28 12:03:20 +0300
commita47ea35d4d872a389b792ecba9ebe05cae9b0243 (patch)
treea378e728c2f1d96477a8b1f79e1fdfe3831df005 /status.sh
parentcc5719a05f754e4f42395dc09761d22510aeb4cf (diff)
downloadall-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 'status.sh')
-rwxr-xr-xstatus.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/status.sh b/status.sh
index e0be46a..6416e2c 100755
--- a/status.sh
+++ b/status.sh
@@ -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)