For those seeking git mastery, or just trying to find their way out of a ditch, here's a couple more resources to look at.
http://www-cs-students.stanford.edu/~blynn/gitmagic/ http://ftp.newartisans.com/pub/git.from.bottom.up.pdf
Hope that helps, Daniel