title: 'git status' shows changes to be commited, but 'git push origin master' says 'Everything up-to-date'
body: <p>I had some conflicts between my local repo and the remote repo. </p>
  
  <p>So, I did:</p>
  
  <pre><code>git stash
  git pull origin master
  git stash apply
  
  // here i had merge conflicts, so i edited the files and did
  git add file1
  git add file2
  
  git commit
  </code></pre>
  
  <p>Now when I do <code>git status</code> it shows a bunch of modified files, etc.
  But <code>git push origin master</code> says <code>Everything up-to-date</code>.</p>
  
  <p>Any ideas?</p>