From 3acdcf7b7f2c96f22f9eea78c317290962d9cc3f Mon Sep 17 00:00:00 2001 From: todb-r7 Date: Fri, 4 May 2012 11:16:17 -0700 Subject: [PATCH] Updated Metasploit Development Environment (markdown) --- dev/Metasploit-Development-Environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/Metasploit-Development-Environment.md b/dev/Metasploit-Development-Environment.md index 691313f4c0..b3f8b6349b 100644 --- a/dev/Metasploit-Development-Environment.md +++ b/dev/Metasploit-Development-Environment.md @@ -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.