ref: deb7402afe2b7b4a047760442e1cfe6d1891bf47
parent: cfcc9e9a57d5daa0add014c83b23ae0eb0f77e84
author: Ori Bernstein <ori@eigenstate.org>
date: Fri Dec 4 21:48:16 EST 2020
git/rebase: first cut of rebase implementation Implement the basic version of git/rebase, handling rewriting commits on one branch as though they were based off a different branch. Rebasing starts by finding the least common ancestor of the two branches, and then replaying every commit from the source branch on to the destination branch, then renaming the source branch. In the case of a conflict, the commits are dumped to a temp file, and the rebase is paused until the user either aborts the rebase or resolves the issue and resumes the rebase.