chapter 3 - 6 commit