I found the Git section of "The Missing Semester of Your CS Education" to be helpful.