Commit ff0213b7a390b719e11862b2187d1610f58652ac
build.sh: merge ff-only
Non-fast-forward merges should not be needed, so avoid attempting them.Greg K Nicholson committed on 2/24/2018, 7:43:52 PM
Parent: b887adf06ee347aac91ba41c510b8e65acbcefdc
Files changed
| build.sh | changed |
| build.sh | ||
|---|---|---|
| @@ -5,13 +5,13 @@ | ||
| 5 | 5 … | git add content/ |
| 6 | 6 … | git commit -m "Update content $(date +%F\ %X)" |
| 7 | 7 … | fi && \ |
| 8 | 8 … | git checkout master && \ |
| 9 | - git merge content && \ | |
| 9 … | + git merge --ff-only content && \ | |
| 10 | 10 … | git checkout content && \ |
| 11 | - git merge master && \ | |
| 11 … | + git merge --ff-only master && \ | |
| 12 | 12 … | git checkout develop && \ |
| 13 | - git merge master && \ | |
| 13 … | + git merge --ff-only master && \ | |
| 14 | 14 … | git checkout master && \ |
| 15 | 15 … | git push && \ |
| 16 | 16 … | pelican && \ |
| 17 | 17 … | git checkout develop |
Built with git-ssb-web