title: Cannot pull with rebase
body: <p>I get this message:</p>
  
  <pre><code>Cannot pull with rebase: You have unstaged changes.
  Please commit or stash them.
  </code></pre>
  
  <p>Yes, I have changes which are not committed. I searched a way to rebase my uncommitted changes on top of the new code which I would get from a pull.</p>
  
  <p>I found this: <a href="https://github.com/aanand/git-up" rel="noreferrer">https://github.com/aanand/git-up</a> </p>
  
  <p>I want to know if this is still the way to go, or if there are more modern ways to go.</p>
  
  <p>I use git version 1.8.1</p>