core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish removing old gitmodules stuff that should've never lasted this 

long
This commit is contained in:
Zach Brown 2014-11-29 23:59:27 -08:00
parent 299b60f280
commit af814004a5
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -40,3 +40,5 @@ Spigot-API
Spigot-Server Spigot-Server
PaperSpigot-Server PaperSpigot-Server
PaperSpigot-API PaperSpigot-API
Bukkit
CraftBukkit

14
upstreamMerge.sh
View File

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