From: Chris Koeritz Date: Sun, 17 Feb 2013 19:53:22 +0000 (-0500) Subject: much nicer now; supports a path to push upstream. X-Git-Tag: 2.140.90~1104 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=159dcfbd3eecd9f4f0a1f4baa4b6e20af520045d;p=feisty_meow.git much nicer now; supports a path to push upstream. --- 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