bigzaphod, I think a significant amount of my git confusion comes from the terminology and the fact that it's maybe surprisingly un-opinionated? It seems there's always more than one way to do stuff and none of those ways seems to be the "right way," really. Of course there are lots of wrong ways - but again, it seems to depend heavily upon who you talk to.
If git were a game I'd be fine with this, but...
...maybe I should start thinking about git as a game?!