X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Frev_control%2Fpush_repo_upstream.sh;h=6210277e7a3eeb29490f3e0bb42c371a3c56906c;hb=5caefd248674b4e0f927abfc7a28f2b298d90e9f;hp=3d69f95f63f6cec3c853e122c07091668d9938dd;hpb=1abc7c0a32c98db6dfbc0ceadbc30a72c54bb13e;p=feisty_meow.git diff --git a/scripts/rev_control/push_repo_upstream.sh b/scripts/rev_control/push_repo_upstream.sh index 3d69f95f..6210277e 100755 --- a/scripts/rev_control/push_repo_upstream.sh +++ b/scripts/rev_control/push_repo_upstream.sh @@ -10,8 +10,13 @@ # rats: how did i set up that archive? # we need to have those steps someplace. +dir="$1"; shift +if [ -z "$dir" ]; then + dir=. +fi + +pushd "$dir" git fetch upstream git merge upstream/master - git push origin master - +popd