title: How to temporarily ignore untracked files on git pull?
body: <p>I have some new files that I didn't add to git yet; I'm not sure I will, I'm still undecided. But I want to get whatever is latest in the server.</p>
  
  <p>However, when I do a <code>git pull</code> I get the error <code>error: Your local changes to 'XXXX' would be overwritten by merge.  Aborting.</code>, where XXXX is my new file. </p>
  
  <p>How can I tell git to download the changes and new files from the server, tell me about possible conflicts between what's on the server and my local modifications to files already in the repository, while at the same time not aborting because I have new files locally? </p>
  
  <p>I don't want to add them to .gitignore, as I have this situation frequently and I don't want to be adding and removing files from .gitignore all the time for silly stuff... especially because I don't want to run the risk of forgetting about a certain file that in the end I would decide that it has to be added to the repository, so I want <code>git status</code> to keep telling me about them. Sometimes I run <code>git status -uno</code> when I want to ignore new files, and then sometimes I run <code>git status</code> to see what's new and decide what to keep and what to discard. But I couldn't find an equivalent option for <code>git pull</code>.</p>
  
  <p>My attempts at googling take me to people who want to overwrite their local changes with what's on the repository, or other similar scenarios. :( After reading the documentation I found that I can do a <code>git fetch</code> to bring my local repository up to date, that didn't yield any errors, but it also didn't bring the changes to my working copy. I can't figure out the next step after that. :-/ In any case, a <code>pull</code> with no errors would be ideal...</p>