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 'main' of feistymeow.org:feisty_meow
[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 1fc6e0ba904d351ee99218237f47fc9218c989d4..0135a40492310f3869d010babe785bd0329172af 100644
(file)
--- a/
scripts/rev_control/push_repo_downstream.sh
+++ b/
scripts/rev_control/push_repo_downstream.sh
@@
-56,13
+56,13
@@
exit_on_error "doing a careful update on: $tempfile"
rm "$tempfile"
# seems to be needed to cause a merge to be resolved.
rm "$tempfile"
# seems to be needed to cause a merge to be resolved.
-git pull downstream ma
ster
+git pull downstream ma
in
# -m "unfortunate merge"
# -m "unfortunate merge"
-exit_on_error "running the git pull downstream ma
ster
"
+exit_on_error "running the git pull downstream ma
in
"
# send our little boat down the stream to the dependent repository.
# send our little boat down the stream to the dependent repository.
-git push --tags downstream ma
ster
-exit_on_error "running the git push downstream ma
ster
"
+git push --tags downstream ma
in
+exit_on_error "running the git push downstream ma
in
"
# do our dev branch also.
git push --tags downstream dev
# do our dev branch also.
git push --tags downstream dev