Git: branching and merging
softwarecave.org