adam/metasploit-gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Metasploit Development Environment (markdown)

Browse Source
This commit is contained in:
todb-r7
2012-05-04 11:16:17 -07:00
parent 3c3447e628
commit 3acdcf7b7f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev/Metasploit-Development-Environment.md
+1 -1
View File
@@ -228,7 +228,7 @@ Of course, you might occasionally run into rebase conflicts, but let's just assu
> A note on terminology: In Git, we often refer to "origin" and "master," which can be confusing. "Origin" is a remote repository which contains all of **your** branches. "Master" is a branch of the source code -- usually the first branch, and the branch you don't tend to commit directly to.
> "Origin" **isn't** Rapid7's repository -- we usually referred to that repo as "Upstream." In other words, "upstream" is just another way of referring to the "rapid7" remote.
> "Origin" **isn't** Rapid7's repository -- we usually refer to that repo as "Upstream." In other words, "upstream" is just another way of referring to the "rapid7" remote.
> Got it? "Origin" is your repo up at GitHub, "upstream" is Rapid7's GitHub repo, and "master" is the primary branch of their respective repos.