
PS1="$"
basedir=`pwd`

function update {
    cd "$basedir/$1"
    git fetch && git reset --hard origin/master
    cd "$basedir/$1/.."
    git add $1
}

update BungeeCord

# Update submodules
git submodule update --recursive

Add an upstream merge script to help merge upstream faster
Add an upstream merge script to help merge upstream faster
