News for hackers. Stuff that matters.
Re:What's New In Git 1.8.5 by justinmk on Wednesday December 04, 2013 @01:40PM (#6849056)
> Somebody merges something and pushes it to the master branch of the repo before it's ready. Now you want to pretend that never happened.

Say 'abc123' is the commit immediately before the merge commit. Run this:

    git rebase -i abc123
In the editor window that appears, delete the commit(s) that you want to "pretend never happened". Exit the editor. Git then replays the commits from abc123 up to HEAD, except without the commits you deleted. Now your local branch is in a state that omits the premature merge commit.
Re:What's New In Git 1.8.5 by steamer25 on Wednesday December 04, 2013 @04:25PM (#6850320)
Or comparable to above,

  git reset --hard <previous commit's hash>
and afterward you may have to

  git push --force
...to overwrite the changes in the blessed/central/public/shared repo.