Update and separate Rebase build-step diagrams
Merge pull request #231 from github/advanced-diagram-fix

Update and separate Rebase build-step diagrams