Changes between Version 38 and Version 39 of GitForDarcsUsers


Ignore:
Timestamp:
Jun 1, 2011 1:23:28 PM (4 years ago)
Author:
igloo
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • GitForDarcsUsers

    v38 v39  
    7171to end up with
    7272{{{
    73 o---o---o---o---o---x---x---x---x <-- master
     73                   /- master
     74o---o---o---o---o---x---x---x---x <-- feature1
     75}}}
     76To include the patches in master:
     77{{{
     78git checkout master
     79git reset --hard feature1
     80}}}
     81{{{
     82o---o---o---o---o---x---x---x---x <-- {master, feature1}
    7483}}}
    7584