From: Chris Koeritz Date: Fri, 10 Nov 2017 20:34:04 +0000 (-0500) Subject: missed the step i knew i needed X-Git-Tag: 2.140.92^2~10 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=7ec00037df7da86467d3a497d048b72e8102037e;p=feisty_meow.git missed the step i knew i needed --- 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.