Add an upstream merge script to help merge upstream faster

This commit is contained in:
Techcable 2016-11-19 10:24:11 -07:00
parent 04e241d472
commit b75189648a
No known key found for this signature in database
GPG Key ID: 091A03B91D7FCE68

15
mergeUpstream.sh Executable file
View File

@ -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