Graft repo commit history #869
Description
https://git-scm.com/docs/git-replace#Documentation/git-replace.txt---graftcommitparent
The commit history of the two repos should be preserved/combined into one. Further updates made in #867 and #868 should then be applied on top of the combined repo.