Commit 196d36bf9ebd3633cf018be99eb461d1552a4b97
build.sh: allow non-ff merges
In practice, content and develop will diverge.Greg K Nicholson committed on 4/28/2018, 11:41:55 AM
Parent: 0a3d44672bce14a00d9a73083ce8ed33675ec114
Files changed
| build.sh | changed |
| build.sh | |||
|---|---|---|---|
| @@ -6,13 +6,13 @@ | |||
| 6 | 6 … | git add content/ | |
| 7 | 7 … | git commit -m "Update content $(date +%F\ %X)" | |
| 8 | 8 … | fi && \ | |
| 9 | 9 … | git checkout master && \ | |
| 10 | - git merge --ff-only content && \ | ||
| 10 … | + git merge content && \ | ||
| 11 | 11 … | git checkout content && \ | |
| 12 | - git merge --ff-only master && \ | ||
| 12 … | + git merge master && \ | ||
| 13 | 13 … | git checkout develop && \ | |
| 14 | - git merge --ff-only master && \ | ||
| 14 … | + git merge master && \ | ||
| 15 | 15 … | git checkout master && \ | |
| 16 | 16 … | git pull && \ | |
| 17 | 17 … | git push && \ | |
| 18 | 18 … | pelican && \ | |
Built with git-ssb-web