Changes between Version 60 and Version 61 of InstallationGuidelines/VirtualMachine

Timestamp:

09/18/13 11:22:12 (11 years ago)

Author:

Pat Tressel

Comment:

--

InstallationGuidelines/VirtualMachine

@@ -63 +63 @@
 {{{
 cd /home/web2py/applications/eden
-git pull
+git pull upstream master
 }}}
 
@@ -69 +69 @@
 {{{
 cd /home/web2py/applications/eden
-git remote add BRANCHNAME https://github.com/flavour/BRANCHNAME.git
-git fetch BRANCHNAME
+git remote add <branch_name> https://github.com/flavour/<branch_name>.git
+git fetch <branch_name>
 }}}
-Now you have both, the trunk ("master" branch) and the specific branch ("BRANCHNAME" branch) in your local repo.
-You can switch between them:
-{{{
-git checkout master
-or
-git checkout BRANCHNAME
-}}}
+Now you have both the trunk ("master" branch) and the specific branch <branch_name> in your local repo.
 
-If, for some reason, you need a specific revision of "master"/trunk, do the following:
+
+If, for some reason, you need a specific revision of the current branch, do the following:
 {{{
 cd /home/web2py/applications/eden
-git checkout -b VERSION NEW_BRANCH_NAME
+git checkout -b <revision> <branch_name>
 }}}
 (git requires a name for a branch if you want to preserve commits.)