title: Prevent local changes getting pushed in Git
body: <p>I have cloned a repository and the <code>master</code> branch in my repo is tracking <code>origin/master</code>. I created a <code>work</code> branch and changed some config files specific to my dev machine to make the app work.</p>
  
  <p>My normal workflow will be to switch to <code>master</code> branch, merge changes made in <code>work</code> branch and <code>push</code> those changes upstream. The problem is that i don't want my specific chnages to get pushed. When i merge my <code>work</code> branch into <code>master</code> those changes are merged also. </p>
  
  <p>The only solution I've found so far is not to commit those changes in <code>work</code> but that's not a satisfactory solution.</p>