Figured it out:

Using `git diff` to capture the changes between two branches and then apply it to the build branch did the trick. Then I just needed to commit and push the changes and I have a neat tidy history for the build branch.

github.com/kingkool68/testing-gi…