Rebase: a linear history

In this lesson you straighten out a branch's history. A merge brings two lines together in a merge commit; rebase takes a different route: it moves your commits onto the tip of another branch, as if you had started work only after it, and the history stays a single straight line. The second mode, an interactive rebase, squashes several small commits into one. The whole lesson is local: there is no server in the sandbox, and none is needed.

What is already set up

The sandbox has a ready repository ~/app, and the commit name and email are already configured. The main branch has moved ahead: after feature was branched off it, a commit editing readme.txt was added to main. On feature sit three commit