Commit 7182ce0fc06c3a886a53d9ae895a970495511315
build.sh: don't rebase master onto develop automatically
Avoid merging any unfinished changes. Rebase develop onto master, to pick up new content.Greg K Nicholson committed on 2/24/2018, 7:59:22 PM
Parent: 656cf78d194c338bf57cf8496b62b6f73fd3d46c
Files changed
| build.sh | changed |
| build.sh | |||
|---|---|---|---|
| @@ -6,9 +6,9 @@ | |||
| 6 | 6 … | git commit -m "Update content $(date +%F\ %X)" | |
| 7 | 7 … | fi && \ | |
| 8 | 8 … | git rebase content master && \ | |
| 9 | 9 … | git rebase master content && \ | |
| 10 | - git rebase master develop && \ | ||
| 10 … | + git rebase develop master && \ | ||
| 11 | 11 … | git checkout master && \ | |
| 12 | 12 … | git push && \ | |
| 13 | 13 … | pelican && \ | |
| 14 | 14 … | git checkout develop | |
Built with git-ssb-web