projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
ce306c8
)
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
author
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 20:17:26 +0000
(15:17 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 20:17:26 +0000
(15:17 -0500)
hmmm, missing this step in scripts
scripts/rev_control/push_repo_downstream.sh
patch
|
blob
|
history
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"
+
+#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