title: How do I update my feature branch commits to be on top of the updated master branch?
body: <p>I created a branch about a month ago. The master branch has been heavily updated since then, and the feature branch doesn't include those updates. I want my commits to sit on top of the updated master branch and I only want my commits to be published. How do I do this (or is this even possible)?</p>
  
  <p>More info:
  My local branch commits have already been pushed to the remote branch, but not the master branch.</p>
  
  <p>I tried <code>git rebase</code>, but then I get a message that says my branches have diverged "and have X and Y different commits each, respectively."</p>
  
  <p>I'm not sure if <code>git push -f</code> will fix my problem. I don't want my remote branch to make note of the changes that have been done on the master branch. I just want my remote/local branch to "sit on top" of the newest version of master and still only show my commits.</p>
  
  <p>I don't want to “merge” master into my branch because then 1000+ commits will overshadow my commits and I want only my commits to be easily reviewed by my peers.</p>