Version control setup for a tutorial

Question

I\'m trying to set up version control for a programming-related tutorial. It\'s proving problematic because there are two different kinds of history:

There\'s the hi

Answer 1

git rebase --interactive is probably the most straightforward solution here. That will let you choose a specific commit to edit, then reapply all the subsequent commits on top of it. Shouldn't be much more difficult than a regular merge, depending on how extensive your change is, of course. Check out the part of the git rebase man page on splitting commits. That will let you keep your original version for historical reasons, then add a new commit just after it in the history where you can move your tag.