Paper/upstreamMerge.sh

#!/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
Add upstreamMerge.sh and update CB submodule 2016-01-26 07:04:43 +01:00			`#!/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 upstream Spigot and upstreamMerge script Also remove paperclip from upstream merge, it shouldn't need merging very often 2016-03-21 18:32:05 +01:00			`update Spigot`