Commit 60ef82c86e3e2d4d3c1b42d787b6fea1e334fbe9
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, 9:11:52 PM
Parent: 4a1bbe53e7b7253ca95091949b101ec77c840079
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