diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 19:00:31 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 19:00:31 -0400 |
| commit | d5e1eb5db3e55eb3943c539342b08d34e4298ccb (patch) | |
| tree | 908d5004b01e7b711ff9ae88f1ffe7ccfb1ef074 | |
| parent | de9b6eeaf0e963ab8cf52c60d9ec5528029d77c8 (diff) | |
| parent | d0a0f806a4bb8072c532ea7b35ad8b7643ac8645 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rwxr-xr-x | generate.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/generate.sh b/generate.sh index 7c8f8af..5fe3c74 100755 --- a/generate.sh +++ b/generate.sh @@ -4,21 +4,21 @@ # .rb files to run the website # To modify it and update the app do the following: -# 1. take care of uncommitted files -# 2. `git checkout clean2` -# 3. `git pull` -# 4. `git checkout master generate.sh` -# 5. `git commit -m 'get changes to generate.sh from master` -# ./generate.sh -# *6. `./generate.sh` -# 7. `git commit -m 'run ./generate.sh'` -# 8. `git checkout master` -# 9. `git merge clean2` -# 10. resolve any merge conflicts -# 11. git push origin clean2 -# 12. `git push origin master` -# 13. ...? -# 14. Profit +# 1. Take care of uncommitted files +# 2. Run `git checkout clean2` +# 3. Run `git pull` +# 4. Make any changes to `generate.sh`, and commit them. +# If you have committed the desired changes to 'master', you can do +# this simply with: +# git checkout master generate.sh +# git commit -m 'Get changes to generate.sh from master +# 5. Run `./generate.sh` +# 6. Run `git commit -m 'run ./generate.sh'` +# 7. Run `git checkout master` +# 8. Run `git merge clean2` +# 9. Resolve any merge conflicts. +# 10. Run `git push origin clean2` +# 11. Run `git push origin master` set -xe |