X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_downstream.sh;h=0135a40492310f3869d010babe785bd0329172af;hb=b4f6c54a3726553a6f0f6c2ba017d0195c01344d;hp=1fc6e0ba904d351ee99218237f47fc9218c989d4;hpb=714f07e34483e14aa4a91047b8891463267ae568;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index 1fc6e0ba..0135a404 100644 --- 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. -git pull downstream master +git pull downstream main # -m "unfortunate merge" -exit_on_error "running the git pull downstream master" +exit_on_error "running the git pull downstream main" # send our little boat down the stream to the dependent repository. -git push --tags downstream master -exit_on_error "running the git push downstream master" +git push --tags downstream main +exit_on_error "running the git push downstream main" # do our dev branch also. git push --tags downstream dev