I could never figure out Git until I read this:

http://www.eecs.harvard.edu/~cduan/technical/git/