title: Git fetch and reset not working as expected
body: <p>A teammate made some fixes in master, and I'm trying to rebase my branch (feature/me/foo, which has three commits after 0f0) onto it.</p>
  
  <p>If I just rebase, the three-way merge clobbers all my changes (in the three files he’s changed). So I found this sweet command:</p>
  
  <pre><code>$ git rebase -s ours master
  </code></pre>
  
  <p>Except it's not at all what I want:</p>
  
  <pre><code>$ git log
  
  commit 20dee42d3e7c06f94618d4e39e84bc07ad2aff9f 
  Author: [him] 
  Date:   Fri Jun 10 14:09:35 2016 -0700
  
  commit 0f0dac94a0094817a3191f699b1b438ec89aaec2 
  Author: [me] 
  Date:   Fri Jun 10 09:14:47 2016 -0700
  </code></pre>
  
  <p>My last three commits (after 0f0) disappeared and are replaced by his. No problem. I'll just revert:</p>
  
  <pre><code>( feature/me/foo ) 11:16:35 &gt; git fetch --all 
  Fetching origin no slots
  
  ( feature/me/foo ) 11:16:45 &gt; git reset --hard 
  feature/me/foo HEAD is now at 20dee42 + minor updates:
  </code></pre>
  
  <p>...except I'm still pointing at his changes, and not the latest from my branch. If I nuke and clone, I get back to the correct state on my branch.</p>
  
  <p>What’s the proper way to “hard reset” my branch to the remote state?</p>