title: Git fetch/pull does not update local repository even though there are changes on origin
body: <p>I have a git repository on my local machine tracking a remote repository (origin) on github. There are 5 days of changes on github on the master branch, yet when I enter <code>git pull origin master</code> or even <code>git fetch</code> I get a message saying everything is up to date even though it isn't. I think the issue may go back to a rebase that messed up that I didn't abort out of. Does anyone have any clues how I can get my local repository to update with the changes on origin?</p>