rapid7/metasploit-framework — pull request #1089 by ipwnstuff (2012-11-21 19:48:43+00:00)
Title: Update msfupdate for all the forkers.

Previously msfupdate defaulted to using `origin/master` to merge updates.
This is problematic for forkers because it will pull updates from our
remote fork. This change defaults to `upstream/master` for adding in
changed.

msfupdate will detect if developers haven't added a remote upstream
referencing the official Rapid7 metasploit-framework repo and do so for
them.