diff options
Diffstat (limited to 'scripts/upstreamMerge.sh')
-rwxr-xr-x | scripts/upstreamMerge.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/scripts/upstreamMerge.sh b/scripts/upstreamMerge.sh new file mode 100755 index 0000000000..16dfaf48d1 --- /dev/null +++ b/scripts/upstreamMerge.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +PS1="$" +basedir="$1" +workdir="$basedir/work" + +function update { + cd "$workdir/$1" + git fetch && git reset --hard origin/master + cd ../ + git add $1 +} + +update Bukkit +update CraftBukkit +update Spigot |