You're going to need to get familiar with git overall. Don't worry though, your situation sounds pretty typical and Git is well-suited for this. You'll do a lot of branching and rebasing, so be sure you are comfortable with those concepts.
This page is a good high-level perspective on what is sounds like you are trying to accomplish. Good luck!