testserver/upstreamMerge.sh

11 lines
172 B
Bash
Raw Normal View History

#!/bin/bash
basedir=`pwd`
function update {
cd $basedir/$1
git fetch && git reset --hard origin/master
cd ../
git add $1
}
update Bukkit
update CraftBukkit