I\'m a Git newbie. I recently moved a Rails project from Subversion to Git. I followed the tutorial here: http://www.simplisticcomplexity.com/2008/03/05/cleanly-migrate-yo
I had a problem that was similar to this where my working directory was ahead of origin by X commits but the git pull was resulting in Everything up-to-date. I did manage to fix it by following this advice. I'm posting this here in case it helps someone else with a similar problem.
The basic fix is as follows:
$ git push {remote} {localbranch}:{remotebranch}
Where the words in brackets should be replaced by your remote name, your local branch name and your remote branch name. e.g.
$ git push origin master:master