mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-31 21:18:10 +01:00
Add an upstream merge script to help merge upstream faster
This commit is contained in:
parent
04e241d472
commit
b75189648a
15
mergeUpstream.sh
Executable file
15
mergeUpstream.sh
Executable 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
|
Loading…
Reference in New Issue
Block a user