Changes between Version 4 and Version 5 of Policy/GitMaster


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

--

Legend:

Unmodified
Added
Removed
Modified
  • Policy/GitMaster

    v4 v5  
    3636}}} 
    3737 
    38 The `--log` paramater appends a list of changes in that branch, which is useful when browsing history.  The `-m` paramater just avoids the ugly (and often meaningless) default merge messages. 
     38The `--log` parameter appends a list of changes in that branch, which is useful when browsing history.  The `-m` parameter just avoids the ugly (and often meaningless) default merge messages. 
    3939 
    4040You may get merge conflicts, in which case, fix them and then commit.  Make sure your local staging branch compiles, and when it does, push to the official staging with