Changes between Version 31 and Version 32 of GitForDarcsUsers


Ignore:
Timestamp:
Apr 3, 2011 10:51:32 PM (3 years ago)
Author:
basvandijk
Comment:

fix typo

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v31 v32  
    4141o---o---A---o---o---o <-- master 
    4242}}} 
    43 The above merge is actually a '''fast-forward''', meaning that no new commit is necessary, since "develop" didn't contain any other changes--the pointer for the "develop" branch is merely set to point to the same commit that feature1 pointed to.  On the other hand, if we now merge "devel" into "master" we get a now commit: 
     43The above merge is actually a '''fast-forward''', meaning that no new commit is necessary, since "develop" didn't contain any other changes--the pointer for the "develop" branch is merely set to point to the same commit that feature1 pointed to.  On the other hand, if we now merge "devel" into "master" we get a new commit: 
    4444{{{ 
    4545$ git checkout master