projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this script needs help
[feisty_meow.git]
/
scripts
/
rev_control
/
push_repo_downstream.sh
diff --git
a/scripts/rev_control/push_repo_downstream.sh
b/scripts/rev_control/push_repo_downstream.sh
index 84214b70a58b04f05423a029420ff76ef7c6e527..ef1bb35a6a49b553c992c08050e62da419afef70 100644
(file)
--- a/
scripts/rev_control/push_repo_downstream.sh
+++ b/
scripts/rev_control/push_repo_downstream.sh
@@
-47,6
+47,18
@@
test_or_die "changing to directory: $dir"
git fetch origin
test_or_die "running git fetch origin"
git fetch origin
test_or_die "running git fetch origin"
+
+#these are all shots in the dark.
+# use our careful updater!
+
+git remote update
+
+# get everything from the origin.
+git fetch --all
+
+# merge the changes in.
+git merge --no-ff --all
+
# turn off occasionally troublesome setting before checkin.
unset GIT_SSH
# turn off occasionally troublesome setting before checkin.
unset GIT_SSH