Some bad Git situations and how I got myself out of them

The screwed up and committed to master should end with:

     git reset --hard origin/master

(assuming that the remote is called "origin") With the example in the text, you have to know the number of commits you've made to master.

LOL. Bookmarking along with my other Git reference sites...

'sudo rmdir'? I don't think that does what they think it does.

It was also a bit pointless to checkout a new branch just to switch back. The whole thing should be

    git branch some-new-branch-name
    git reset --hard origin/master
    git checkout some-new-branch-name

> Oh shit, I accidentally committed to the wrong branch!

Other ways to do it (that don't require to retype the commit message): - rebase onto the correct branch:

  git branch foo

  git reset --hard HEAD~

  git rebase --onto name-of-the-correct-branch HEAD foo

  git checkout name-of-the-correct-branch

  git merge foo

  git branch -D foo

- cherry-pick

  git reset --hard HEAD~

  git checkout name-of-the-correct-branch

  git cherry-pick name-of-the-branch-you-mistakenly-committed-to@{1} (or git cherry-pick HEAD@{2})

> Oh shit, I tried to run a diff but nothing happened?!

You probably want to know `git diff HEAD` too.

Edit: formatting.