title: GIT: forgot to commit and have made new changes. How to undo new changes, commit then redo changes?
body: <p>I have a file that I should have committed but forgot all about. I went on to make more changes to a file. What I want to do is revert to where I <em>should</em> have committed, do a commit at that point, but still then get my new changes back. How do I do this in the most economical way?</p>
  
  <p>Thanks.</p>
  
  <p>EDIT:  Just to explain the flow a bit.</p>
  
  <ul>
  <li>I have file.php which has been committed and is in a working state.</li>
  <li>I make changes to file.php which is the new production copy of file.php. This file is <strong>not</strong> committed, but should be.</li>
  <li>I make more changes to file.php and remember that I wanted to commit file.php.</li>
  </ul>
  
  <p>What I want to do now is save my recent changes (so git stash may come in handy here, thanks for that!) go back to the second bullet point, commit, then continue on. Is there a way to get to that middle uncommitted point?</p>
  
  <p>FURTHER EDIT:</p>
  
  <p>I think the bit I'm not explaining well, is that there is <strong>no</strong> commit down for the second point above. In that state it doesn't belong to the previous commit, but a new commit that doesn't yet exist.</p>