Taking a look at how git merge compares to git rebase. (Includes a tiny bit about interactive rebase.)
