learngit

Levels need a desktop

A level is you typing real Git commands and editing files while the commit graph moves under you, all on one screen. That needs a keyboard and room for three columns.

Rebase · level 4.1Merge vs rebase, same fork

Open it on a laptop and you will be rebasing within the hour.

learngit
12 / 33
0 XP

Working directory

working tree cleannothing differs from the last commit
Unchanged2
a.js
x.js
A addedM modifiedU untrackedD deleted
{ }select a file to edit
commit graph
↑ history · tab complete · ⌘Z undo

Merge vs rebase, same fork

+0 XP

Same starting point, same work, two different histories. Merge kept a truthful record of the fork; rebase produced a straight line by rewriting your commit. Neither is correct in general. The choice is about what you want the log to say.

Next level →