Paper/upstreamMerge.sh
Zach Brown 48c7674933 Update upstream Spigot and upstreamMerge script
Also remove paperclip from upstream merge, it shouldn't need merging very often
2016-03-21 12:32:05 -05:00

16 lines
199 B
Bash
Executable file

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