Waterfall/scripts/mergeUpstream.sh
Shane Freeder 339460b7c3 Misc script fixes
Also, grab upstreamCommit
2019-02-20 19:49:13 +00:00

17 lines
244 B
Bash
Executable File

#!/usr/bin/env bash
PS1="$"
basedir=`pwd`
function update {
cd "$basedir/$1"
git fetch && git reset --hard origin/master
cd "$basedir/$1/.."
git add $1
}
update Waterfall
# Update submodules
git submodule update --recursive