diff options
| author | Zach Brown <[email protected]> | 2014-11-29 23:59:27 -0800 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2014-11-29 23:59:27 -0800 |
| commit | dd4fea747eb71937bee5dd390faf8b99d035e9da (patch) | |
| tree | 026dea73fc0fa1f7f61e7657909df1de87aca339 | |
| parent | 2a9fde22dd66f7fde0c1f13fbc0650700a4e4ad4 (diff) | |
| download | Paper-dd4fea747eb71937bee5dd390faf8b99d035e9da.tar.gz Paper-dd4fea747eb71937bee5dd390faf8b99d035e9da.zip | |
Finish removing old gitmodules stuff that should've never lasted this
long
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | upstreamMerge.sh | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index c101ffb154..952f896233 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ Spigot-API Spigot-Server PaperSpigot-Server PaperSpigot-API +Bukkit +CraftBukkit diff --git a/upstreamMerge.sh b/upstreamMerge.sh deleted file mode 100755 index c95e357a23..0000000000 --- a/upstreamMerge.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 |