I have been using git for a few months now, surely it’s great, and of course confusing, sometimes.
For example, I was very confused with the rebase function, not that I didn’t understand what the purpose of it, but the workflow wasn’t so clear to me. So I asked on stackoverflow and got a pretty decent answer there, hopefully the link below would help you out if you are having the same confusion.
http://stackoverflow.com/questions/11979414/git-rebase-confusion