Git commit-tree parlor tricks, Part 8: I just rebased my branch, but I should have merged

Git commit-tree parlor tricks, Part 8: I just rebased my branch, but now I realize that I should have merged | The Old New Thing