title: Git: Create a branch. Commits a bunch. Go back to master branch, only wants to merge certain commits
body: <p>I am currently on my master branch. I need some help with CSS but unfortunately my site is protected by authentication. This makes it very difficult for others to come to my site to debug. I was planning to start a new branch, fixing_css, with the first commit removing all authentication mechanism. </p>
  
  <p>Then I was thinking of commiting changes made to CSS. After that, I want to merge that branch back to the master except for the first commit (since I want my site to be protected by my authentication system).</p>
  
  <p>How do I go about doing that? </p>