rapid7/metasploit-framework — pull request #2172 by todb-r7 (2013-07-30 02:50:35+00:00)
Title: Reverting disaster merge to 593363c5f with diff

There was a disaster of a merge at 6f37cf22eb that is particularly
difficult to untangle (it was a bad merge from a long-running local
branch).

What this commit does is simulate a hard reset, by doing thing:

git checkout -b reset-hard-ohmu
git reset --hard 593363c5f903c49d423346b2d3e15910340d8a91
git checkout upstream-master
git checkout -b revert-via-diff
git diff --no-prefix upstream-master..reset-hard-ohmy > patch
patch -p0 < patch

Since there was one binary change, also did this:

git checkout upstream-master data/exploits/CVE-2012-1535/Main.swf

Now we have one commit that puts everything back. It screws up
file-level history a little, but it's at least at a point where we can
move on with our lives. Sorry.