Commit 46caa64d177e9ede1879dae776ed09bc0cc39466
build.sh: automate merge commit messages
Greg K Nicholson committed on 4/28/2018, 11:46:10 AMParent: 867e03bad831281b405a265d9ef54122277cae3f
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 content && \ | ||
| 10 … | + git merge -m Merge --log content && \ | ||
| 11 | 11 … | git checkout content && \ | |
| 12 | - git merge master && \ | ||
| 12 … | + git merge -m Merge --log master && \ | ||
| 13 | 13 … | git checkout develop && \ | |
| 14 | - git merge master && \ | ||
| 14 … | + git merge -m Merge --log master && \ | ||
| 15 | 15 … | git checkout master && \ | |
| 16 | 16 … | git pull && \ | |
| 17 | 17 … | git push && \ | |
| 18 | 18 … | pelican && \ | |
Built with git-ssb-web