X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fversion_control.sh;h=84607308ff50b3ade5a2fff5b0e513ce310c655c;hb=fc0c30c2b8ba564812510f0586b7edda8220b5ea;hp=1224480f3823fe27a3ec7c6a8e79ebbc689b707b;hpb=9772e6f24294e4a5507a9fd64d6fdb8bb56f106f;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 1224480f..84607308 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -283,9 +283,6 @@ function do_careful_git_update()
 {
   local this_branch="$(my_branch_name)"
 
-#proposition: this step didn't help before, and it seems redundant now.
-#...
-#hmmm, maybe it is needed.  and people did seem to want it first, so trying that.
   # first update all our remote branches to their current state from the repos.
   git remote update
   test_or_die "git remote update"
@@ -303,7 +300,7 @@ function do_careful_git_update()
 #    echo "synchronizing remote branch: $bran"
     git checkout "$bran"
     test_or_die "git checking out remote branch: $bran"
-    git pull --no-ff
+    git pull --no-ff origin "$bran"
     test_or_die "git pull of remote branch: $bran"
   done
   # now switch back to our branch.