Yeah, git is a mindfuck, even more if you want to really understand it. If you're one of the those types, I recommend this tutorial. You can probably get competent enough without it, but for me it's v important to understand what's really going on underneath everything, which is not a strategy I necessarily endorse, but one I can't kick.