title: How to pull for all files except one?
body: <p>I want to pull changes except for one file (<code>GNUmakefile</code> below). I've looked at the <a href="https://www.kernel.org/pub/software/scm/git/docs/git-pull.html" rel="noreferrer"><code>git-pull(3)</code></a> man pages, but the option is not readily apprent to me.</p>
  
  <p>How do I pull all changes, but skip the file that's causing git trouble? Is there an option to "ignore files with conflicts" or "ignore file X" or similar?</p>
  
  <p>(The worst part is, the <code>GNUmakefile</code> was copied/pasted between virtual machines, so they are nearly the same file. <code>cryptopp-rw</code>'s makefile has a few dependency recipes added at the end of it).</p>
  
  <pre><code>cryptopp-rw$ git pull
  remote: Counting objects: 7, done.
  remote: Total 7 (delta 4), reused 4 (delta 4), pack-reused 3
  Unpacking objects: 100% (7/7), done.
  From https://github.com/weidai11/cryptopp
     4206b4a..cf08f3e  master     -&gt; origin/master
  Updating 4206b4a..cf08f3e
  error: Your local changes to the following files would be overwritten by merge:
      GNUmakefile
  Please, commit your changes or stash them before you can merge.
  Aborting
  </code></pre>