Changes between Version 60 and Version 61 of InstallationGuidelines/VirtualMachine


Ignore:
Timestamp:
09/18/13 11:22:12 (8 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • InstallationGuidelines/VirtualMachine

    v60 v61  
    6363{{{
    6464cd /home/web2py/applications/eden
    65 git pull
     65git pull upstream master
    6666}}}
    6767
     
    6969{{{
    7070cd /home/web2py/applications/eden
    71 git remote add BRANCHNAME https://github.com/flavour/BRANCHNAME.git
    72 git fetch BRANCHNAME
     71git remote add <branch_name> https://github.com/flavour/<branch_name>.git
     72git fetch <branch_name>
    7373}}}
    74 Now you have both, the trunk ("master" branch) and the specific branch ("BRANCHNAME" branch) in your local repo.
    75 You can switch between them:
    76 {{{
    77 git checkout master
    78 or
    79 git checkout BRANCHNAME
    80 }}}
     74Now you have both the trunk ("master" branch) and the specific branch <branch_name> in your local repo.
    8175
    82 If, for some reason, you need a specific revision of "master"/trunk, do the following:
     76
     77If, for some reason, you need a specific revision of the current branch, do the following:
    8378{{{
    8479cd /home/web2py/applications/eden
    85 git checkout -b VERSION NEW_BRANCH_NAME
     80git checkout -b <revision> <branch_name>
    8681}}}
    8782(git requires a name for a branch if you want to preserve commits.)