Commit 87d28850e72803b8f32654befddb59470c6a805d
build.sh: fix rebase commands
We want to rebase develop onto master, which is git rebase master develop (the commits from develop come after the commits from master) Git's CLI is confusing.Greg K Nicholson committed on 2/25/2018, 11:29:42 PM
Parent: 8083e8cffeb14b7970ee01cd4eb4fc2e16ace1f6
Files changed
| build.sh | changed |
| build.sh | |||
|---|---|---|---|
| @@ -4,11 +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 master content && \ | ||
| 8 | 9 … | git rebase content master && \ | |
| 9 | - git rebase master content && \ | ||
| 10 | - git rebase develop master && \ | ||
| 10 … | + git rebase master develop && \ | ||
| 11 | 11 … | git checkout master && \ | |
| 12 | 12 … | git push && \ | |
| 13 | 13 … | pelican && \ | |
| 14 | 14 … | git checkout develop | |
Built with git-ssb-web