Last active
December 20, 2015 23:59
-
-
Save kernelsmith/6217194 to your computer and use it in GitHub Desktop.
MSF snippets, one-liners, tricks and cheats
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| * New Indentation Rules | |
| https://github.com/rapid7/metasploit-framework/wiki/Indentation-Standards | |
| * Pick up a defunct submitter's change | |
| someone else could pick up the change while committing like so: | |
| git merge --no-ff upstream/pr/2212 | |
| git merge --no-ff dmaloney-r7/pr/8 | |
| (assuming you added @dmaloney-r7's branch as a remote) | |
| Doing so will tend to violate two-person code review practices when | |
| committing to master, and therefore should only be done if the original | |
| author went AWOL, or you want to create a new PR with the changes for | |
| re-review |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment