[Linux.conf.au 2013] - Git For Ages 4 And Up

Caption notes

At linux.conf.au 2013, Michael Schwern uses toys and labels to explain Git commits and branches. He presents the staging area as the place to prepare the next commit and uses labels pointing to commits to explain how branches advance. A fast-forward can move a branch reference when the two histories have not diverged. With diverging histories, he shows how a merge can create a new commit joining both lines. He also explains rebase as replaying changes and creating new commits, then uses a shared branch to illustrate why that change can affect collaborators.