title: Git update local ignoring few files (is not .gitignore)
body: <pre><code>Scenario:
   Bitbucket:
    file1 
    file2 
    file3  
  
   Local:
    file1 - person1 is working on it
    file2 - person2 is working on it
    file3 - common with personal hardcoded configuration
    untracked files
  </code></pre>
  
  <p>person1 commits and pushes his changes on file1.
  How person2 can update file1 in his local without resetting file2, file3 and untracked files?
  It's a while that I'm trying to do it but I still don't find an easy way!
  Thanks.</p>