title: Git merge: keep only the staged commits and toss the rest?
body: <p>While doing a merge/rebase, I often hit this scenario:
   - hit some conflicts
   - resolve the important ones, moving them to the index</p>
  
  <p>Then, there's a bunch of unstaged junk and I just want to keep HEAD version. Ideally I could just do "git commit &amp;&amp; git reset --hard", but git wont let me commit while there's still unmerged stuff pending. I tried "git stash save --keep-index" but that fails. I tried "git diff | patch -Rp1" (and various mutations). I dont think any of the "git reset" modes match what I want.</p>
  
  <p>There's gotta be a way to just say "I got what I want, just discard the rest".</p>