title: Git pull with unstaged changes
body: <p>Attempting a git pull when you have unstaged changes will fail, saying you can commit or stash then. I suppose a workaround is to git stash, git pull, then git stash pop. However, is there an alternative way to do this? I would like to forcefully git pull if there are unstaged changes, but <em>only</em> if the files being brought down do not override the modified files? AKA. if I have a repo with the files "derp1", "derp2", "derp3" and modify "derp1" locally, a git pull will bring down and overwrite everything except the "derp1" file.</p>
  
  <p>I assume a git stash + pull + stash pop achieves this already? And is there a better way?</p>
  
  <p>I suppose this could also work differently if it occurs on a submodule. </p>