From db00a62afa67e533c4a9980ba78030980f50d8af Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 24 Nov 2014 16:02:06 +0300
Subject: Add force key to pull.sh

With this key it will start git pull even if changes present.
It will merge if conflict happend
This option must NOT used by developers.

Examples:
    ./pull.sh force
---
 pull.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pull.sh b/pull.sh
index 8c2d278..6e490c0 100755
--- a/pull.sh
+++ b/pull.sh
@@ -6,10 +6,15 @@ function status {
     fi
     DIR=`pwd`
     cd "$1"
+    echo "$2:"
+    if [[ "${CMD}" == "force" ]]; then
+        git pull --commit --no-edit
+        cd $DIR
+        return
+    fi
     STR=`git diff --name-only`
     STR2=`git status|grep "Your branch is ahead"`
     STR3=`git status -s -uno`
-    echo "$2:"
     if [[ -n "${STR}${STR2}${STR3}" ]]; then
         echo -e "\e[1;31mCant pull because changes not pushed\e[0m"
     else
@@ -39,6 +44,11 @@ function status2 {
     cd $DIR
 }
 
+CMD="$1"
+if [[ -z "${CMD}" ]]; then
+    export CMD="normal"
+fi
+
 status . evol-all
 status client-data client-data
 status2 server-code server-code
-- 
cgit v1.2.3-60-g2f50