You are on a branch confusingly named michaeltyson/master, not your master branch. You most likely tried to checkout a tracking branch or something Git did something stupid. Run 'git checkout master' to get back to your master branch, then 'git merge 8b2e83' to ff-merge the tip of your weird branch. Then the push will work.
Then delete that ref, because it's very confusing, as you can well see. Scott On Tue, May 25, 2010 at 3:52 AM, Michael <[email protected]> wrote: > Hello! > > I'm having a little trouble pushing a couple of recent commits to my > fork (http://github.com/michaeltyson/potionstore/tree/); I have 4 > local commits, but when I try a "git push <remotename> master", Git > just reports "Everything up-to-date", and no changes appear on Github. > > I'm rather new to git, coming from svn, so I'm afraid I'm not sure > where to go from here. > > Does anyone have any suggestions? > > Thanks heaps in advance! > > > Here's some state info: > > $ git branch > master > * michaeltyson/master > > $ git remote show michaeltyson > * remote michaeltyson > Fetch URL: [email protected]:michaeltyson/potionstore.git > Push URL: [email protected]:michaeltyson/potionstore.git > HEAD branch: master > Remote branch: > master tracked > Local ref configured for 'git push': > master pushes to master (up to date) > > $ git ls-remote . > 8b2e83faf50a1a57321507be79c0f9dae317ff6f HEAD > e749a17053dc42430bc53f3e205f90a0806b975f refs/heads/master > 8b2e83faf50a1a57321507be79c0f9dae317ff6f refs/heads/michaeltyson/ > master > e749a17053dc42430bc53f3e205f90a0806b975f refs/remotes/michaeltyson/ > master > 7edc33aa2704bee219cfa625e98082bbad329bf1 refs/remotes/origin/HEAD > 7edc33aa2704bee219cfa625e98082bbad329bf1 refs/remotes/origin/master > > > $ git log --pretty=oneline . > 8b2e83faf50a1a57321507be79c0f9dae317ff6f Reverted countries.yml to > prior version > 635796d55bf4f1278bac6c3b74d569d63fad76c7 Replaced use of counties.yml > with a new > 0eb06f35295941ae1b02fe010ab96696b0eecb1e Fixed use of deprecated > (presumably) 'h > 91ded11a5ffddd92acfd5ece9d65ea4c8c1d1947 Fixed incorrect country code > for United > e749a17053dc42430bc53f3e205f90a0806b975f Avoid displaying thankyou if > no order i > > > $ git push michaeltyson master > Everything up-to-date > > -- > You received this message because you are subscribed to the Google Groups > "GitHub" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/github?hl=en. > > -- You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/github?hl=en.
