branch test 1
branch test2
Merge branch 'branch1' of https://github.com/scpenland/rebase-test into branch1

* 'branch1' of https://github.com/scpenland/rebase-test:
  branch test2
  branch test 1
Merge branch 'branch1'

* branch1:
  branch test2
  branch test 1