title: git stash -> merge stashed change with current changes
body: <p>I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch.  What I want is a way to merge my stashed changes with the current changes.  </p>
  
  <p>Is there a way to do this?</p>
  
  <p>Its more for convenience, I eventually gave up and committed first my current changes, then my stashed changes, but I would have preferred to get them in with one fell swoop.</p>