Things to be covered here:
Also see MavensMate and Git for Non Developers
Deploying profiles is tricky.
Simply Salesforce.com: Deploy Salesforce Profile using Change Set
Oh how I wish you could validate the Change Set from the Sandbox against Production rather than uploading it, then validating it, finding out it's wrong, then having to come back and clone the Change Set again.