Commit 656cf78d194c338bf57cf8496b62b6f73fd3d46c
build.sh: rebase instead of merging
Greg K Nicholson committed on 2/24/2018, 7:51:00 PMParent: ff0213b7a390b719e11862b2187d1610f58652ac
Files changed
| build.sh | changed |
| build.sh | ||
|---|---|---|
| @@ -4,14 +4,11 @@ | ||
| 4 | 4 … | then |
| 5 | 5 … | git add content/ |
| 6 | 6 … | git commit -m "Update content $(date +%F\ %X)" |
| 7 | 7 … | fi && \ |
| 8 … | + git rebase content master && \ | |
| 9 … | + git rebase master content && \ | |
| 10 … | + git rebase master develop && \ | |
| 8 | 11 … | git checkout master && \ |
| 9 | - git merge --ff-only content && \ | |
| 10 | - git checkout content && \ | |
| 11 | - git merge --ff-only master && \ | |
| 12 | - git checkout develop && \ | |
| 13 | - git merge --ff-only master && \ | |
| 14 | - git checkout master && \ | |
| 15 | 12 … | git push && \ |
| 16 | 13 … | pelican && \ |
| 17 | 14 … | git checkout develop |
Built with git-ssb-web