OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add upstreamMerge.sh and update CB submodule

Browse source
This commit is contained in:
Zach Brown 2016-01-26 00:04:43 -06:00
parent 4431926268
commit 92d56450d4
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CraftBukkit

@ -1 +1 @@
Subproject commit a66b96584771093d7199eff150161b83384b7056
Subproject commit 75593ab621f26c3954bff13057d2ed6720da7592

15
upstreamMerge.sh Executable file
View file

@ -0,0 +1,15 @@
#!/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