Paper/upstreamMerge.sh

mirror of https://github.com/PaperMC/Paper.git synced 2024-11-03 01:10:37 +01:00
#!/bin/bash
basedir=`pwd`
function update {
    cd $basedir/$1
    git fetch && git reset --hard origin/master
    cd ../
    git add $1
}
update Bukkit
update CraftBukkit
Initial commit - hello future of Spigot! 2013-01-15 02:18:40 +01:00			`#!/bin/bash`
Switch to pwd so the scripts can work more reliably on other OSs 2013-01-21 10:24:30 +01:00			basedir=`pwd`
Initial commit - hello future of Spigot! 2013-01-15 02:18:40 +01:00			`function update {`
			`cd $basedir/$1`
			`git fetch && git reset --hard origin/master`
			`cd ../`
			`git add $1`
			`}`
			`update Bukkit`
			`update CraftBukkit`