title: git: many local changes that I don't want to commit
body: <p>The problem:</p>
  
  <p>I cloned a repository, there are some configuration files to customize the behaviour of the compiled app, I changed some of them (about 10) to suit my needs. Now, every time I commit something, I have to go through line by line in the output of <code>git status</code> (or "unstaged files" in my daily used GUI), and that 10 files, which I don't want to commit, are always there, this quickly becomes annoying.</p>
  
  <p>Is there some unknown (to me) feature of git or trick to let git ignore these 10 files when I need <code>git status</code>, but when I <code>git pull</code> the changed (by upstream) version of these files, I still get a conflict (if there is one)?</p>
  
  <p>I cannot merge all these files into one big config, partly because they are different things and partly because the app is running in production for some times now.</p>
  
  <p>Git aliases probably won't work, for if nothing fancy needs to be done, I usually use a GUI, (better looking diff, convenient control of what to commit, etc.), not <code>git</code> in a terminal.</p>