Some bad Git situations and how I got myself out of them(ohshitgit.com)

    # Make correcting change
    git commit --all --fixup=<ref of commit with mistake>
    # Continue working on branch, then at some point
    git rebase --interactive --autosquash

  git revert <bad commit>
  git push

    git tag tmp
    git perform-stunt

  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

  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})

    # disappear the last commit and all changes from it
    git reset --hard HEAD^
    # make a new branch using the last commit
    git checkout -b new-branch HEAD@{1}

    # disappear the last commit and all changes from it
    git reset --hard HEAD^
    # get onto the new branch
    git checkout new-branch
    # grab the stuff from what was on the old branch
    git cherry-pick old-branch@{1}

    git diff --cached

    Bizarrely, git won't do a dif of files that have 
    been add-ed to your staging area without this flag.
    File under ¯\_(ツ)_/¯"

    git add .

     git reset --hard origin/master

    # create a new branch from the current state of master
    git checkout -b some-new-branch-name
    # remove the commit from the master branch
    git checkout master

    cd ..
    sudo rmdir nsfw-git-repo-dir

  git commit --amend --no-edit

    git checkout otherbranch
    git checkout firstbranch -- fileIwant maybe1more
    git commit -m "brought over files"