Changes between Version 3 and Version 4 of Policy/GitMaster


Ignore:
Timestamp:
02/01/11 04:21:48 (9 years ago)
Author:
takkaria
Comment:

remove blocks of text and replace with terminal command blocks

Legend:

Unmodified
Added
Removed
Modified
  • Policy/GitMaster

    v3 v4  
    55Assuming your local repo has as its "origin" your own github repo, you'll need to add a new remote to track the official one: `git remote add official git@github.com:angband/angband.git` (this url assumes you are using ssh access and have configured your local ssh config accordingly). After a `git fetch official` you will then see the official/master, official/staging and official/integration branches, as well as all the origin/ branches of your own github repo.  
    66 
    7 Make a local copy of the official/staging branch: `git checkout official/staging` followed by `git checkout -b staging`.  To keep this branch up-to-date, do `git fetch official` followed by `git checkout staging` and `git merge official/staging`.  You will want to do this whenever you want to commit to the remote repository. 
     7Make a local copy of the official/staging branch: 
     8{{{ 
     9$ git checkout official/staging 
     10$ git checkout -b staging 
     11}}} 
     12 
     13To keep this branch up-to-date: 
     14{{{ 
     15$ git fetch official 
     16$ git checkout staging 
     17$ git merge official/staging 
     18}}} 
    819 
    920== Feature branches ==