infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typos

unstable
Erran Carey 2012-11-27 11:47:59 -06:00 committed by Tod Beardsley
parent 2b5c1c8e6f
commit 8c9e1abc8d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msfupdate
View File

@ -45,7 +45,7 @@ end
# the user originally cloned or forked. # the user originally cloned or forked.
def add_git_upstream def add_git_upstream
$stdout.puts "[*] Attempting to add remote 'upstream' to your local git repository." $stdout.puts "[*] Attempting to add remote 'upstream' to your local git repository."
system("git", "remote", "add", "upstream", "git://github.com/rapid7/rapid7metasploit-framework.git") system("git", "remote", "add", "upstream", "git://github.com/rapid7/metasploit-framework.git")
$stdout.puts "[*] Added remote 'upstream' to your local git repository." $stdout.puts "[*] Added remote 'upstream' to your local git repository."
end end
@ -115,7 +115,7 @@ if is_git
add_git_upstream unless $?.success? and out =~ %r{(https|git|git@github\.com):(//github\.com/)?(rapid7/metasploit-framework\.git)} add_git_upstream unless $?.success? and out =~ %r{(https|git|git@github\.com):(//github\.com/)?(rapid7/metasploit-framework\.git)}
remote = @git_remote || "upstream" remote = @git_remote || "upstream"
branch = @git_branchch || "master" branch = @git_branch || "master"
# This will save local changes in a stash, but won't # This will save local changes in a stash, but won't
# attempt to reapply them. If the user wants them back # attempt to reapply them. If the user wants them back