Run paper upstream from anywhere

woops
2016-09-07 19:45:47 -05:00 · 2016-09-07 19:45:47 -05:00 · 53bb048935
parent 9963d9d4ae
commit 53bb048935
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@ -75,7 +75,10 @@ case "$1" in
        cd "${PAPER_TEST_DIR:-$basedir/work/test-server}"
    ;;
    "u" | "up" | "upstream")
+    (
+        cd "$basedir"
        scripts/upstreamMerge.sh "$basedir" "$2"
+    )
    ;;
    "r" | "root")
        cd "$basedir"