projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of feistymeow.org:feisty_meow into dev
[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 1224480f3823fe27a3ec7c6a8e79ebbc689b707b..84607308ff50b3ade5a2fff5b0e513ce310c655c 100644
(file)
--- 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)"
{
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"
# 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"
# 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.
test_or_die "git pull of remote branch: $bran"
done
# now switch back to our branch.