From 7ec00037df7da86467d3a497d048b72e8102037e Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 10 Nov 2017 15:34:04 -0500 Subject: [PATCH] missed the step i knew i needed --- scripts/rev_control/version_control.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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. -- 2.34.1