From b75189648a4aedf35112253b0e08312b6c1caa13 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Sat, 19 Nov 2016 10:24:11 -0700
Subject: [PATCH] Add an upstream merge script to help merge upstream faster

---
 mergeUpstream.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 mergeUpstream.sh

diff --git a/mergeUpstream.sh b/mergeUpstream.sh
new file mode 100755
index 0000000..8e4428d
--- /dev/null
+++ b/mergeUpstream.sh
@@ -0,0 +1,15 @@
+
+PS1="$"
+basedir=`pwd`
+
+function update {
+    cd "$basedir/$1"
+    git fetch && git reset --hard origin/master
+    cd "$basedir/$1/.."
+    git add $1
+}
+
+update BungeeCord
+
+# Update submodules
+git submodule update --recursive