enabling pulls again in dev branch

[feisty_meow.git] / scripts / rev_control / version_control.sh

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 291789f13d7bd852e28723721d478df5ae30ee19..45da63255334528f9b601ad1db61e25380a73b9e 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -91,6 +91,7 @@ function do_checkin()
         git commit .
         test_or_die "git commit"
       fi
+
 #      # upload the files to the server so others can see them.
 #      git push 2>&1 | grep -v "X11 forwarding request failed"
 #      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
@@ -278,15 +279,16 @@ else
     echo "Diverged"
 fi
 
-echo The rest of pull is not being done yet.
-return 1
-
   # now pull down any changes in our own origin in the repo, to stay in synch
   # with any changes from others.
-  git pull --no-ff origin
+  git pull --no-ff --all
   test_or_die "git fetch origin"
 
 
+echo The rest of pull is not being done yet.
+return 1
+
+
 
 # below has older shards of partial knowledge.