From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 17:51:06 +0000 (-0500)
Subject: enabling pulls again in dev branch
X-Git-Tag: 2.140.91^2~18
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e8e2f7c37e0dd4d8dbb1d361c8efa43538fe1809;p=feisty_meow.git

enabling pulls again in dev branch
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 8c714ece..45da6325 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -279,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.