Add upstreamMerge.sh and update CB submodule

2 files changed, 21 insertions, 0 deletions

diff --git a/CraftBukkit b/CraftBukkit
-Subproject a66b96584771093d7199eff150161b83384b705
+Subproject 75593ab621f26c3954bff13057d2ed6720da759
diff --git a/upstreamMerge.sh b/upstreamMerge.sh
new file mode 100755
index 0000000000..7da28daf0a
--- /dev/null
+++ b/upstreamMerge.sh
@@ -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
+